From af901c370628fcc0203f5ac9df7ff305b27ae165 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 11 Aug 2015 23:01:39 -0500 Subject: [PATCH 1/2] Fixes #1298 --- .../static_src/wagtailadmin/scss/components/main-nav.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss index 13087e18d..43cb5f3a6 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss @@ -3,12 +3,15 @@ $submenu-color:darken($color-grey-1, 5%); .nav-wrapper{ position: relative; - background: $color-grey-1; margin-left: -$menu-width; width: $menu-width; float: left; height:100%; min-height:800px; + + .inner { + background: $color-grey-1; + } } #nav-toggle{ left: $mobile-nice-padding; @@ -278,7 +281,6 @@ body.explorer-open { .footer{ padding-top:1em; - background-color:$color-grey-1; position:fixed; width:$menu-width - 7; bottom:0; From 99f8bb8508c0c58696e39ac51c72d31047c65866 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2015 11:22:43 -0500 Subject: [PATCH 2/2] Fixed sidebar background color mobile bug --- .../static_src/wagtailadmin/scss/components/main-nav.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss index 43cb5f3a6..38c1ef0c9 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss @@ -8,7 +8,7 @@ $submenu-color:darken($color-grey-1, 5%); float: left; height:100%; min-height:800px; - + background: $color-grey-1; .inner { background: $color-grey-1; } @@ -406,7 +406,7 @@ body.explorer-open { } /* Media query hacks to detect IE10+ which doesn't support 3d transform of static elements and needs a fallback */ -@media all and (-ms-high-contrast: none), +@media all and (-ms-high-contrast: none), all and (-ms-high-contrast: active) { .wrapper{ @include transition(left 0.2s ease); @@ -416,7 +416,7 @@ body.explorer-open { .wrapper{ @include transform(none); left:$menu-width; - position:relative + position:relative } } body.explorer-open { @@ -430,7 +430,7 @@ body.explorer-open { } } -@media all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: none), +@media all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: none), all and (min-width: $breakpoint-mobile) and (-ms-high-contrast: active){ body.explorer-open{ .wrapper {