Skip to content

Commit 988ba06

Browse files
authored
Merge pull request #1062 from codeRIT/bh-1058
Navbar fixes: tweak position, add pos: fixed to desktop, hover bug fixed
2 parents 7a15bef + 7ec4e84 commit 988ba06

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

sass/main.scss

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ $event-count: 6;
7878
// Transition all elements on the screen
7979
// (except FAQ panel, which already has a transition,
8080
// and the section days, which need no transition.)
81-
&:not(.panel):not(#days):not(.number):not(#desk) {
81+
&:not(nav.link):not(.panel):not(#days):not(.number):not(#desk) {
8282
transition: all 1s ease;
8383
}
8484

@@ -118,16 +118,16 @@ p {
118118

119119
// Nav
120120
nav {
121-
background-color: rgba(white, 5%);
121+
background-color: rgba(#5864a5, 50%);
122122
display: flex;
123123
justify-content: space-between;
124124
font-size: $nav-fontsize;
125125
height: $nav-height;
126-
position: absolute;
126+
position: fixed;
127127
top: 0;
128128
left: 0;
129129
right: 0;
130-
z-index: 3;
130+
z-index: 4;
131131

132132
.left, .right {
133133
display: flex;
@@ -136,7 +136,7 @@ nav {
136136

137137
a {
138138
padding: 0px 5px;
139-
margin: 0px 10px;
139+
margin-left: 10px;
140140
}
141141

142142
.link:hover {
@@ -151,9 +151,8 @@ nav {
151151
}
152152

153153
#logo {
154-
align-self: flex-start;
155-
width: $nav-height;
156154
height: $nav-height;
155+
align-self: flex-start;
157156

158157
img {
159158
width: $nav-height;
@@ -225,7 +224,7 @@ nav {
225224
width: 100%;
226225
right: 0;
227226
bottom: 0;
228-
z-index: 1;
227+
z-index: 2;
229228

230229
#desk, #wire {
231230
position: absolute;

0 commit comments

Comments
 (0)