Skip to content

Commit 6f96de4

Browse files
authored
Nav bar (#454)
* added Angela Hao's profile * angela hao's profile * angela hao's profile * updated the join us button and lower border * updated logo * updated old logo to new logo * including new logo * updated nav bar * Revert "angela hao's profile" This reverts commit 8792519.
1 parent 6049a01 commit 6f96de4

File tree

6 files changed

+83
-6
lines changed

6 files changed

+83
-6
lines changed

_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div id="navbar-inner">
33
<a href="{{site.baseurl}}/">
44
<div id="nav-title" class="nav-section left">
5-
<img src="{{site.baseurl}}/img/teachLA_wordmark_light.svg" id="acm-tla-wordmark" alt="ACM Teach LA Wordmark" />
5+
<img src="{{site.baseurl}}/img/teachLA_wordmark_gradient.svg" id="acm-tla-wordmark" alt="ACM Teach LA Wordmark" />
66
</div>
77
</a>
88
<div class="nav-section right" id="desktop-nav">
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"folders": [
3+
{
4+
"path": ".."
5+
},
6+
{
7+
"path": "../../blueprint"
8+
}
9+
],
10+
"settings": {}
11+
}

_sass/_navbar.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#navbar {
2-
position: fixed;
2+
position: absolute;
33
z-index: 10;
44
top: 0;
55
left: 0;
66
height: 70px;
77
width: 100%;
88
background: white;
9-
box-shadow: 0px 0px 4px #E2E2E2;
10-
border-bottom: 1px solid $teachla-green;
9+
box-shadow: 0px 1px 4px #E2E2E2;
1110
font-family: $font-display;
1211
color: $font-primary-color;
1312

@@ -31,6 +30,7 @@
3130
height: 50px;
3231
width: auto;
3332
margin-top: 10px;
33+
background-color: white;
3434
}
3535

3636
ul.nav-items {
@@ -53,7 +53,7 @@
5353

5454
&.nav-button {
5555
background: white;
56-
border-radius: 4px;
56+
border-radius: 10px;
5757
margin-left: 15px;
5858
color: $teachla-green;
5959
border: 2px solid $teachla-green;
@@ -183,7 +183,7 @@
183183
}
184184

185185
a.active li,
186-
a.active ul.nav-items li:hover {
186+
a.active ul.nav-items li:hover {
187187
color: $teachla-green !important;
188188
}
189189

_team/ahao.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: "Angela Hao"
3+
group: "member"
4+
title: "Developer"
5+
graduating_year: 2026
6+
img: "Angela Hao.jpg"
7+
pronouns: "she/her"
8+
---

img/teachLA_wordmark_gradient.svg

Lines changed: 58 additions & 0 deletions
Loading

img/team/Angela Hao.jpg

845 KB
Loading

0 commit comments

Comments
 (0)