Skip to content

Xiaopow patch 1 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiaopow wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Xiaopow patch 1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb4c317
Update main.css
xiaopow Apr 8, 2020
3711fab
Update navbar.css
xiaopow Apr 8, 2020
ffa5722
Update main.css
xiaopow Apr 25, 2020
0233b62
Update index.html
xiaopow Apr 25, 2020
dc099a5
Update main.css
xiaopow May 19, 2020
e522461
Update index.html
xiaopow Jun 2, 2020
88c7ab7
Update main.css
xiaopow Jul 6, 2020
813f45b
Update index.html
xiaopow Jul 6, 2020
030b9c1
Merge pull request #1 from Altcademy/xiaopow-patch-2-1
xiaopow Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 10 additions & 25 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
/* Main Content */

.main-content {
overflow-y:visible;
position:relative;
height:100px;
}

.main {
padding-left: 0px;
padding-right: 0px;
top: -20px;
}

.img-responsive {
Expand All @@ -27,6 +19,12 @@
text-align: center;
}

.content-background {
margin-left: -15px;
margin-right: -15px;
position: relative;
}

#story {
text-transform: uppercase;
color:black;
Expand All @@ -41,30 +39,18 @@ a {
color:inherit;
}

.info {
.info-wrapper {
border-top: 4px solid #ff0500;
padding: 15px 30px 25px;
position: relative;
}

@media only screen and (max-width:767px) {
.wrapping {
padding-left: 0;
padding-right: 0;
}
}

@media only screen and (min-width: 768px){
.info {
margin-top: -150px;
}
.glass {
.info-wrapper {
background-image: linear-gradient(to bottom,rgba(255,255,255,0.5) 0,#fff 50%,#fff 100%);
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
height:155px;
}
}

Expand All @@ -79,8 +65,7 @@ a {
/* Main Horizontal Divider- after main pic */

.main-horizontal-divider {
width: 100%;
border-bottom:1px solid #f2f2f2;
border-top:1px solid #f2f2f2;
}

/* ----------------------- */
Expand Down
4 changes: 4 additions & 0 deletions css/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/*-- Navbar --*/

.topnav {
margin-bottom: 0;
}

.topnav .container-fluid {
padding-left: 0px;
padding-right: 0px;
Expand Down
59 changes: 27 additions & 32 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,50 +196,47 @@ <h4>Subscribe To The Newsletter</h4>
</nav>

<div class="container-fluid main-content">
<div class="row">
<div class="col-xs-12">
<div class="row">
<!--Main-->
<div class="col-md-9 main wrapping">
<div class="content-background">
<img src="images/main/main_main.jpg" class="img-responsive">
<div class="info-wrapper">
<div class="glass"></div>
<div class="info">
<h2 class="category-main">
<a href="#">U.S.</a>
</h2>
<h2 id="story"><a href="#">Justice Dept. To Force Reforms</a></h2>
<div class="summary">"The residents of Ferguson have waited nearly a year for their city to adopt an agreement."
</div>
</div>
</div>
</div>

<div class="main-horizontal-divider"></div>

<div class="col-xs-12 col-sm-6 sub-box vertical-divider">
<img src="images/main/main1.png" class="img-responsive">
<div class="sub-info">
<div class="info-wrapper">
<h2 class="category-main">
<a href="#">U.S.</a>
</h2>
<h2 id="story"><a href="#">Gravitational Waves Detected, Proving Einstein Right</a></h2>
<div class="summary">“This [was] truly a scientific moon shot, and we landed on the moon.”
<h2 id="story"><a href="#">Justice Dept. To Force Reforms</a></h2>
<div class="summary">"The residents of Ferguson have waited nearly a year for their city to adopt an agreement."
</div>
</div>
</div>

<div class="col-xs-12 col-sm-6 sub-box" id="sponsor-special">
<div id="blue-background">
<img src="images/main/main2.jpg" class="img-responsive">
<hr class="main-horizontal-divider" />

<div class="row">
<div class="col-xs-12 col-sm-6 sub-box vertical-divider">
<img src="images/main/main1.png" class="img-responsive">
<div class="sub-info">
<h2 class="category-main blue">
<a href="#">SPONSOR INSIGHT</a>
</h2>
<h2 id="story"><a href="#">The Best Universities of Asia</a>
<h2 class="category-main">
<a href="#">U.S.</a>
</h2>
<div class="summary">"Universities from Asia and Europe are challenging the best schools in the USA. When it comes to choosing the right school then, the options have never been more diverse…"
<h2 id="story"><a href="#">Gravitational Waves Detected, Proving Einstein Right</a></h2>
<div class="summary">“This [was] truly a scientific moon shot, and we landed on the moon.”
</div>
</div>
</div>

<div class="col-xs-12 col-sm-6 sub-box" id="sponsor-special">
<div id="blue-background">
<img src="images/main/main2.jpg" class="img-responsive">
<div class="sub-info">
<h2 class="category-main blue">
<a href="#">SPONSOR INSIGHT</a>
</h2>
<h2 id="story"><a href="#">The Best Universities of Asia</a>
</h2>
<div class="summary">"Universities from Asia and Europe are challenging the best schools in the USA. When it comes to choosing the right school then, the options have never been more diverse…"
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -273,8 +270,6 @@ <h2 id="story"><a href="#">The Best Universities of Asia</a>
</div>
</div>

</div>
</div>
</div>

</div>
Expand Down