Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Commit 8aede2d

Browse files
Merge branch 'master' into fix-guide-page-overflow
2 parents d1965ea + d95434f commit 8aede2d

File tree

5 files changed

+70
-14
lines changed

5 files changed

+70
-14
lines changed

src/components/NavBar.vue

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,32 @@
88
<router-link class="navLink" to="/">
99
<span class="navLogo"><img src="../../static/logo.png" height="50px"></span>
1010
</router-link>
11+
<div id="mobileNavHeading">
12+
<h1 id="bio">Bio</h1><h1 id="js">JS</h1>
13+
</div>
1114
<router-link class="navLink" to="/components"><span>Components</span></router-link>
1215
<router-link class="navLink" to="/guide"><span>Guide</span></router-link>
1316
<router-link class="navLink" to="/about"><span>About</span></router-link>
1417
<router-link class="navLink" to="/contact"><span>Contact Us</span></router-link>
1518
<div class="close">
1619
<img @click="closeMenu()" src="../../static/close.png" alt="Close menu">
1720
</div>
21+
<div id="mobileNavBottom">
22+
<div id="mobileNavSocialLink">
23+
<a href="https://github.com/biojs/biojs-frontend"><img src="../../static/github.png" alt="GitHub" class="mobileNavSocialLinkImg"></a>
24+
<a href="https://twitter.com/biojslibrary?lang=en"><img src="../../static/twitter.png" alt="Twitter" class="mobileNavSocialLinkImg"></a>
25+
<a href="mailto:[email protected]"><img src="../../static/mail.png" alt="Mail" class="mobileNavSocialLinkImg"></a>
26+
</div>
27+
</div>
1828
</div>
1929
<div id="mobileNav">
2030
<div class="hamburger" onclick="">
2131
<img src="../../static/hamburger.png" alt="Open Menu" @click="openMenu()">
2232
</div>
23-
<h2>Bio<span>JS</span></h2>
33+
34+
<router-link class="navLink logoLink" to="/">
35+
<span><img src="../../static/logo.png" height="44px"></span>
36+
</router-link>
2437
</div>
2538
</div>
2639
</div>
@@ -100,6 +113,7 @@ export default {
100113
width: 80%;
101114
display: flex;
102115
justify-content: space-around;
116+
background: #f7f9ff;
103117
span {
104118
font-size: 17px;
105119
cursor: pointer;
@@ -123,16 +137,44 @@ export default {
123137
display: none;
124138
}
125139
}
140+
141+
#mobileNavHeading{
142+
display: none;
143+
padding: 30px;
144+
#bio{
145+
color: #007E3A;
146+
}
147+
#js{
148+
color: #000000;
149+
}
150+
151+
#bio, #js{
152+
font-weight: 700;
153+
display: inline !important;
154+
}
155+
}
156+
#mobileNavBottom{
157+
display: none;
158+
flex: 1;
159+
align-items: flex-end;
160+
161+
#mobileNavSocialLink{
162+
display: flex;
163+
justify-content: center;
164+
padding: 30px;
165+
flex: 1;
166+
}
167+
}
126168
#mobileNav {
127169
display: none;
128170
align-items: center;
129-
h2 {
130-
color: #007e3a;
131-
margin: 0;
132-
padding: 0;
171+
width: 100%;
172+
.logoLink {
173+
margin-left: auto;
174+
padding-right: 20px;
133175
}
134-
span {
135-
color: #000;
176+
.navLogo-m {
177+
height: 44px;
136178
}
137179
}
138180
.hamburger {
@@ -150,9 +192,10 @@ export default {
150192
.close {
151193
position: absolute;
152194
right: 20px;
153-
top: 10px;
195+
top: 35px;
154196
height: 40px;
155197
width: 40px;
198+
z-index: 100;
156199
display: none;
157200
img {
158201
height: 100%;
@@ -187,11 +230,10 @@ export default {
187230
justify-content: flex-start;
188231
background: #fff;
189232
margin: 0;
190-
padding-top: 80px;
191-
-webkit-transition: 0.3s all ease-in;
192-
-moz-transition: 0.3s all ease-in;
193-
-o-transition: 0.3s all ease-in;
194-
transition: 0.3s all ease-in;
233+
-webkit-transition: 0.4s all cubic-bezier(1,0,0,1);
234+
-moz-transition: 0.4s all cubic-bezier(1,0,0,1);
235+
-o-transition: 0.4s all cubic-bezier(1,0,0,1);
236+
transition: 0.4s all cubic-bezier(1,0,0,1);
195237
span {
196238
padding-left: 30px;
197239
line-height: 60px;
@@ -212,12 +254,15 @@ export default {
212254
#mobileNav {
213255
display: flex;
214256
}
215-
.close {
257+
#mobileNav, #mobileNavBottom, .close {
216258
display: flex;
217259
}
218260
#homeLink {
219261
order: -1;
220262
}
263+
#mobileNavHeading{
264+
display: block;
265+
}
221266
}
222267
@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) {
223268
}

static/github.png

4.9 KB
Loading

static/mail.png

3.98 KB
Loading

static/node_modules/propdoc/style.scss

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/twitter.png

3.75 KB
Loading

0 commit comments

Comments
 (0)