From 4dc564b143af1ca2c596b4401ea59a3d3fa90b1f Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Fri, 27 Apr 2012 15:48:09 +1200 Subject: [PATCH] BUGFIX: actions panel Fix actions panel background colours and shading to work on both the main page content areas and the settings area. Adjust margin and z-index so there isn't a visible space on the left-hand side. --- admin/css/screen.css | 3 ++- admin/scss/_style.scss | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 6eb145c0b..fb659ff79 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -305,7 +305,8 @@ body.cms { overflow: hidden; } .ss-loading-screen .loading-animation { display: none; position: absolute; left: 49%; top: 75%; } /** -------------------------------------------- Actions -------------------------------------------- */ -.cms-content-actions { margin: 8px 16px 16px 16px; height: 32px; z-index: 70; background-color: #e6eaed; -moz-box-shadow: #e6eaed 0 -16px 16px; -webkit-box-shadow: #e6eaed 0 -16px 16px; -o-box-shadow: #e6eaed 0 -16px 16px; box-shadow: #e6eaed 0 -16px 16px; } +.cms-content-actions { margin: 8px 16px 16px 0; padding-left: 16px; height: 32px; z-index: 0; -moz-box-shadow: #e6eaed 0 -16px 16px; -webkit-box-shadow: #e6eaed 0 -16px 16px; -o-box-shadow: #e6eaed 0 -16px 16px; box-shadow: #e6eaed 0 -16px 16px; } +.root-form .cms-content-actions { -moz-box-shadow: rgba(240, 243, 244, 0.8) 0 -16px 16px; -webkit-box-shadow: rgba(240, 243, 244, 0.8) 0 -16px 16px; -o-box-shadow: rgba(240, 243, 244, 0.8) 0 -16px 16px; box-shadow: rgba(240, 243, 244, 0.8) 0 -16px 16px; } /** -------------------------------------------- Messages -------------------------------------------- */ .message { margin: 0 0 8px 0; padding: 7px 7px; font-weight: bold; border: 1px black solid; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 0047c24d7..1b8cb8fd5 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -372,11 +372,14 @@ body.cms { * -------------------------------------------- */ .cms-content-actions { - margin: $grid-y $grid-x*2 $grid-y*2 $grid-x*2; + margin: $grid-y $grid-x*2 $grid-y*2 0; + padding-left:$grid-x*2; height: $grid-y*4; - z-index: 70; - background-color:darken($color-widget-bg, 2%); + z-index: 0; @include box-shadow(darken($color-widget-bg, 2%) 0 $grid-y*-2 $grid-y*2); + .root-form &{ + @include box-shadow(rgba($tab-panel-texture-color, 0.8) 0 $grid-y*-2 $grid-y*2); + } } /** --------------------------------------------