Skip to content

Commit 8ebf47f

Browse files
Merge pull request #100 from OpenSourceOrg/merge/mobile-nav
Merge/mobile nav
2 parents 324dbcb + 59da844 commit 8ebf47f

6 files changed

Lines changed: 31 additions & 21 deletions

File tree

themes/osi/assets/scss/_6_components.header.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
color: inherit;
1010
}
1111
}
12+
.admin-bar {
13+
.header-main.header-main-small {
14+
top: 46px;
15+
}
16+
17+
}
1218
.header--inner {
1319
padding: 0;
1420
position: static;
@@ -108,8 +114,6 @@
108114

109115
@media only screen and (max-width: #{$break-nav}) {
110116
.header-main-small {
111-
pointer-events: none;
112-
113117
.header--blog-name img {
114118
max-height: 67.19px;
115119
}

themes/osi/assets/scss/_6_components.mobile-menu.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66
width: 100%;
77
}
88

9+
.open-the-menu {
10+
.open-button-wrapper {
11+
position: fixed;
12+
}
13+
.admin-bar {
14+
.open-button-wrapper {
15+
top: 46px;
16+
}
17+
}
18+
}
19+
920
.open-button:not(.open-search) {
1021
@include drop-shadow($x-axis: 0, $y-axis: 0px, $blur: 0, $alpha: 0);
1122
background: none;

themes/osi/assets/scss/_6_components.navigation.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,6 @@ nav {
8888
margin-left: auto;
8989
padding: 2.1rem 0;
9090
transition: all 0.8s ease;
91-
// position: absolute;
92-
// right: 100%;
93-
// top: 0;
94-
// // @include transition(all .8s);
95-
// width: 80%;
96-
97-
.header-main-small & {
98-
padding: 0;
99-
}
10091

10192
ul {
10293
list-style: none;
@@ -167,7 +158,7 @@ footer {
167158
margin-top: $quicklinksTop; // quicklinks header height
168159
max-height: 0;
169160
overflow: hidden;
170-
position: absolute;
161+
position: fixed;
171162
right: 0;
172163
top: 0;
173164
transition: all .3s;

themes/osi/assets/scss/_7_vendor.plugins.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ form.wp-block-jetpack-contact-form {
8989

9090
/* Specific styling for mobile devices */
9191
@media only screen and (max-width: 768px) {
92-
9392
.header-main-small {
9493
display: block !important;
9594
}

themes/osi/style.css

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

themes/osi/style.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)