Skip to content

Commit aa0a123

Browse files
grantcmgrantcm
committed
Moved menu layout into other website pages. Fixed margins on main section and centered elements in about page.
1 parent 5931811 commit aa0a123

File tree

5 files changed

+70
-33
lines changed

5 files changed

+70
-33
lines changed

Diff for: ‎about.html

+19-10
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,26 @@
1212
<body>
1313
<header>
1414
<div class="container">
15-
<div id="branding">
16-
<h1 id="title">CS for Social Good</h1>
15+
<h1 id="title">
16+
<span class="icon">
17+
<img class="iconImg" src="img/trimmed_logo.png">
18+
</span>
19+
UNC CS + Social Good
20+
</h1>
21+
<div class="navbar">
22+
<div class="navlink">
23+
<a href="index.html">Home</a>
24+
</div>
25+
<div class="navlink" id="current">
26+
<a href="#">About Us</a>
27+
</div>
28+
<div class="navlink">
29+
<a href="projects.html">Projects</a>
30+
</div>
31+
<div class="navlink">
32+
<a href="workwithus.html">Work with Us</a>
33+
</div>
1734
</div>
18-
<nav>
19-
<ul>
20-
<li><a href ="index.html">Home</a></li>
21-
<li class="current"><a href="about.html">About Us</a> </li>
22-
<li><a href="projects.html">Projects</a></li>
23-
<li><a href="workWithUs.html">Work with Us</a></li>
24-
</ul>
25-
</nav>
2635
</div>
2736
</header>
2837

Diff for: ‎css/main.css

+12-2
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,13 @@ header .container{
262262
#showcase .container{
263263

264264
}
265+
265266
#showcase h1{
266267
margin-top: 100px;
267268
font-size: 55px;
268269
margin-bottom: 10px;
269270
}
271+
270272
#showcase p{
271273
font-size: 25px;
272274
margin-top: 20%;
@@ -276,7 +278,7 @@ header .container{
276278
}
277279

278280

279-
/* Newsletter */
281+
/* SignUp */
280282
#signUp{
281283
width: 100%;
282284
text-align: center;
@@ -289,6 +291,7 @@ header .container{
289291
float: left;
290292
margin:auto;
291293
}
294+
292295
.signUpContainer{
293296
display: inline-block;
294297
margin: 15px auto auto;
@@ -337,9 +340,16 @@ footer{
337340
/* About Us */
338341

339342
article#main-col{
340-
width: 80%;
343+
width: 90%;
344+
margin: auto;
341345
}
342346

347+
/* Default Main Section */
348+
.main {
349+
margin: 10px;
350+
}
351+
352+
343353
/* ==========================================================================
344354
Helper classes
345355
========================================================================== */

Diff for: ‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ <h1>Become a Member!</h1>
7575
</div>
7676
</section>
7777

78-
<section id ="boxes">
78+
<section class="main" id ="boxes">
7979
<div class="container">
8080
<!--Each box contains an object such as a project or partner-->
8181
<!--An icon should be included to maintain layout-->

Diff for: ‎projects.html

+19-10
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,26 @@
1212
<body>
1313
<header>
1414
<div class="container">
15-
<div id="branding">
16-
<h1 id="title">CS for Social Good</h1>
15+
<h1 id="title">
16+
<span class="icon">
17+
<img class="iconImg" src="img/trimmed_logo.png">
18+
</span>
19+
UNC CS + Social Good
20+
</h1>
21+
<div class="navbar">
22+
<div class="navlink">
23+
<a href="index.html">Home</a>
24+
</div>
25+
<div class="navlink">
26+
<a href="about.html">About Us</a>
27+
</div>
28+
<div class="navlink" id="current">
29+
<a href="#">Projects</a>
30+
</div>
31+
<div class="navlink">
32+
<a href="workwithus.html">Work with Us</a>
33+
</div>
1734
</div>
18-
<nav>
19-
<ul>
20-
<li><a href ="index.html">Home</a></li>
21-
<li><a href="about.html">About Us</a> </li>
22-
<li class="current"><a href="projects.html">Projects</a></li>
23-
<li><a href="workWithUs.html">Work with Us</a></li>
24-
</ul>
25-
</nav>
2635
</div>
2736
</header>
2837
<section class="main">

Diff for: ‎workwithus.html

+19-10
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,26 @@
1717
<body>
1818
<header>
1919
<div class="container">
20-
<div id="branding">
21-
<h1 id="title">CS for Social Good</h1>
20+
<h1 id="title">
21+
<span class="icon">
22+
<img class="iconImg" src="img/trimmed_logo.png">
23+
</span>
24+
UNC CS + Social Good
25+
</h1>
26+
<div class="navbar">
27+
<div class="navlink">
28+
<a href="index.html">Home</a>
29+
</div>
30+
<div class="navlink">
31+
<a href="about.html">About Us</a>
32+
</div>
33+
<div class="navlink">
34+
<a href="projects.html">Projects</a>
35+
</div>
36+
<div class="navlink">
37+
<a href="#" id="current">Work with Us</a>
38+
</div>
2239
</div>
23-
<nav>
24-
<ul>
25-
<li><a href ="index.html">Home</a></li>
26-
<li><a href="about.html">About Us</a> </li>
27-
<li><a href="projects.html">Projects</a></li>
28-
<li class="current"><a href="workWithUs.html">Work with Us</a></li>
29-
</ul>
30-
</nav>
3140
</div>
3241
</header>
3342
<section class="main">

0 commit comments

Comments
 (0)