Skip to content

Commit de97cdc

Browse files
authored
Merge pull request docker#11381 from ingshtrom/11366-sidebar-formatting-fix
fix the background color of the sidebar on 'medium' sized devices
2 parents 26b3dcb + 3961a25 commit de97cdc

File tree

2 files changed

+13
-32
lines changed

2 files changed

+13
-32
lines changed

_scss/_mobile.scss

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
position: fixed;
6262
width: 100%;
6363
z-index: 100;
64+
background-color: $bg-sidebar;
6465
}
6566
.main-content {
6667
padding: 22px 35px 25px 30px;
@@ -117,16 +118,10 @@
117118
.header {
118119
height: 100px;
119120
}
120-
.nav-secondary-tabs,
121-
.nav-secondary {
122-
background-color: $black;
123-
}
124-
.nav-secondary input[type=search] {
125-
background: rgb(78, 77, 77) url(/images/search.png) no-repeat 10px 9px;
126-
}
121+
/*.nav-secondary-tabs,
127122
.nav-sidebar a {
128123
color: #a8a8a8;
129-
}
124+
}*/
130125
.tabs {
131126
float: left;
132127
margin: 0;
@@ -147,8 +142,8 @@
147142
}
148143
.sidebar,
149144
.sidebar-home {
150-
background-color: #15212e;
151-
border-right: 1px solid rgba(204,204,204,0.29);
145+
background-color: $bg-sidebar;
146+
/*border-right: 1px solid rgba(204,204,204,0.29);*/
152147
top: 51px;
153148
left: 0;
154149
display: block;
@@ -236,23 +231,18 @@
236231
.nav-secondary-tabs {
237232
height: 100px;
238233
}
239-
.nav-secondary {
240-
background: $black;
241-
height: 100px;
242-
}
243234
.content {
244235
padding: 120px 20px;
245236
}
246237
.main-content {
247238
padding: 0 10px;
248239
}
249-
.nav-sidebar a {
240+
/*.nav-sidebar a {
250241
color: #a8a8a8;
251-
}
242+
}*/
252243
.sidebar,
253244
.sidebar-home {
254-
background-color: #15212e;
255-
border-right: 1px solid rgba(204,204,204,0.29);
245+
background-color: $bg-sidebar;
256246
top: 51px;
257247
left: 0;
258248
display: block;
@@ -310,15 +300,8 @@
310300
.toc-nav a {
311301
font-size: 11px;
312302
}
313-
}
314-
315-
/* Portrait */
316-
@media only screen
317-
and (min-device-width: 768px)
318-
and (max-device-width: 1024px)
319-
and (orientation: portrait) {
320-
.nav-secondary input[type=search] {
321-
background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px;
303+
.sidebar {
304+
background-color: $bg-sidebar;
322305
}
323306
}
324307

@@ -337,9 +320,6 @@
337320
.sidebar, .sidebar.affix {
338321
width: 270px;
339322
}
340-
.nav-secondary input[type=search] {
341-
background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px;
342-
}
343323
}
344324

345325
.navbar-toggle {
@@ -358,8 +338,8 @@
358338

359339
@media (max-width: 1024px) {
360340
.nav-secondary-tabs.affix-top {
361-
// background-color: $bg-secondary;
362-
background-color: rgba(0,0,0,.05);
341+
/*background-color: $bg-secondary;
342+
background-color: rgba(0,0,0,.05); */
363343
position: fixed;
364344
top: 0;
365345
}

_scss/_night-mode.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ body.night {
5555
.nav-secondary .search-form input[type=search]:focus {
5656
background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px !important;
5757
}
58+
.sidebar,
5859
.sidebar-home,
5960
#sidebar-wrapper,
6061
#sidebar-wrapper-home,

0 commit comments

Comments
 (0)