Skip to content

Commit

Permalink
Nav bar (#454)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
angelahao6 authored Jan 29, 2023
1 parent 6049a01 commit 6f96de4
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 6 deletions.
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="navbar-inner">
<a href="{{site.baseurl}}/">
<div id="nav-title" class="nav-section left">
<img src="{{site.baseurl}}/img/teachLA_wordmark_light.svg" id="acm-tla-wordmark" alt="ACM Teach LA Wordmark" />
<img src="{{site.baseurl}}/img/teachLA_wordmark_gradient.svg" id="acm-tla-wordmark" alt="ACM Teach LA Wordmark" />
</div>
</a>
<div class="nav-section right" id="desktop-nav">
Expand Down
11 changes: 11 additions & 0 deletions _includes/teach-la-website.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"folders": [
{
"path": ".."
},
{
"path": "../../blueprint"
}
],
"settings": {}
}
10 changes: 5 additions & 5 deletions _sass/_navbar.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#navbar {
position: fixed;
position: absolute;
z-index: 10;
top: 0;
left: 0;
height: 70px;
width: 100%;
background: white;
box-shadow: 0px 0px 4px #E2E2E2;
border-bottom: 1px solid $teachla-green;
box-shadow: 0px 1px 4px #E2E2E2;
font-family: $font-display;
color: $font-primary-color;

Expand All @@ -31,6 +30,7 @@
height: 50px;
width: auto;
margin-top: 10px;
background-color: white;
}

ul.nav-items {
Expand All @@ -53,7 +53,7 @@

&.nav-button {
background: white;
border-radius: 4px;
border-radius: 10px;
margin-left: 15px;
color: $teachla-green;
border: 2px solid $teachla-green;
Expand Down Expand Up @@ -183,7 +183,7 @@
}

a.active li,
a.active ul.nav-items li:hover {
a.active ul.nav-items li:hover {
color: $teachla-green !important;
}

Expand Down
8 changes: 8 additions & 0 deletions _team/ahao.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: "Angela Hao"
group: "member"
title: "Developer"
graduating_year: 2026
img: "Angela Hao.jpg"
pronouns: "she/her"
---
58 changes: 58 additions & 0 deletions img/teachLA_wordmark_gradient.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/team/Angela Hao.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6f96de4

Please sign in to comment.