From c8ed2e718c6e5b81236d57a1746f8443cf26b61f Mon Sep 17 00:00:00 2001 From: Josh Barr Date: Sat, 4 Apr 2015 02:21:42 +1300 Subject: [PATCH] fixing footer + toolbar overlay --- .../scss/components/datetimepicker.scss | 16 ++++++++-------- .../static/wagtailadmin/scss/core.scss | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss index 4902c2418..bc5adcfdd 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss @@ -7,7 +7,7 @@ padding-left: 0px; padding-top: 2px; position: absolute; - z-index: 9999; + z-index: 1; -moz-box-sizing: border-box; box-sizing: border-box; display:none; @@ -98,7 +98,7 @@ content:"n"; } } - + .xdsoft_timepicker{ width: 70px; float:left; @@ -153,7 +153,7 @@ } } } - + .xdsoft_label{ display: inline; position: relative; @@ -184,16 +184,16 @@ background:#fff; max-height:160px; overflow-y:hidden; - + &.xdsoft_monthselect{right:-7px;} &.xdsoft_yearselect{right:2px;} - + > div > .xdsoft_option:hover{ color: #fff; background: #ff8000; } > div > .xdsoft_option{ - padding:2px 15px 2px 5px; + padding:2px 15px 2px 5px; } > div > .xdsoft_option.xdsoft_current{ background: #33AAFF; @@ -213,7 +213,7 @@ } .xdsoft_calendar{ clear:both; - + table{ border-collapse:collapse; } @@ -256,7 +256,7 @@ opacity:0.5; background:$color-grey-3; } - + .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{ opacity:0.2; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss index df4a7320f..14530f485 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss @@ -265,9 +265,16 @@ footer{ .nav-wrapper{ z-index:2; } -.content-wrapper{ - z-index:3; -} + +// Avoiding a stacking context for the content-wrapper saves us a world +// of pain when dealing with overlays that are appended to the end of +// , eg Hallo & calendars. As long as content-wrapper remains floated, +// the z-index shouldn't be required. + +// .content-wrapper{ + // z-index:3; +// } + .nav-submenu{ z-index:6; } @@ -338,7 +345,7 @@ footer, .logo{ } .content-wrapper{ border-bottom-right-radius: 5px; - } + } .logo{ margin:1em auto; @@ -353,13 +360,13 @@ footer, .logo{ margin:auto; display:block; } - } + } footer{ width:80%; margin-left:50px; } - + .content{ border-top:0; background-color:none;