From c621a6d69962fb80e25c3ffd3aac0b1da66574bc Mon Sep 17 00:00:00 2001 From: Jeremy Bridson Date: Wed, 15 Aug 2012 11:28:31 +1200 Subject: [PATCH] BUGFIX: fixed trac 7665 - CMS Menu header now changes height depending on the name of the admin and greeting message. position and height were being set inline so added !important to override this. --- admin/css/screen.css | 11 +++++++---- admin/scss/_menu.scss | 23 +++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 3b9953899..9ad8536ac 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -761,8 +761,8 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-tree a.jstree-loading .jstree-pageicon { background: url(../images/throbber.gif) top left no-repeat; } /** Styles for the left hand side menu and header for the admin panels. Take into consideration CSS selector performance. @package framework @subpackage admin */ -.cms-logo-header { background-color: #00111d; position: relative; padding: 0 8px 0 4px; line-height: 24px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMTExZCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAxMTFkIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00111d), color-stop(50%, #003050), color-stop(100%, #00111d)); background-image: -webkit-linear-gradient(#00111d, #003050, #00111d); background-image: -moz-linear-gradient(#00111d, #003050, #00111d); background-image: -o-linear-gradient(#00111d, #003050, #00111d); background-image: -ms-linear-gradient(#00111d, #003050, #00111d); background-image: linear-gradient(#00111d, #003050, #00111d); } -.cms-logo-header span { color: white; display: block; } +.cms-logo-header { background-color: #00111d; position: relative !important; top: auto !important; height: auto !important; padding: 0 8px 0 4px; line-height: 24px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMTExZCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAxMTFkIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00111d), color-stop(50%, #003050), color-stop(100%, #00111d)); background-image: -webkit-linear-gradient(#00111d, #003050, #00111d); background-image: -moz-linear-gradient(#00111d, #003050, #00111d); background-image: -o-linear-gradient(#00111d, #003050, #00111d); background-image: -ms-linear-gradient(#00111d, #003050, #00111d); background-image: linear-gradient(#00111d, #003050, #00111d); } +.cms-logo-header span { color: white; display: block; padding-left: 26px; } .cms-logo-header span a { color: #3ebae0; display: inline; } .cms-logo { border-bottom: 1px solid #03090c; overflow: hidden; padding: 8px 0; position: relative; vertical-align: middle; font-size: 12px; } @@ -770,12 +770,12 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-logo a { position: absolute; top: 8px; bottom: 8px; left: 4px; display: block; width: 24px; background: url("../images/logo_small.png") no-repeat left center; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; } .cms-logo span { font-weight: bold; font-size: 14px; line-height: 20px; padding: 2px 0; margin-left: 44px; } -.cms-login-status { border-top: 1px solid #19435c; height: 24px; padding: 7px 4px 0 4px; overflow: hidden; line-height: 16px; font-size: 11px; } +.cms-login-status { border-top: 1px solid #19435c; padding: 7px 4px; line-height: 16px; font-size: 11px; } .cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 3px; background: url('../images/sprites-32x32-sb47394f892.png') 0 -76px no-repeat; text-indent: -9999em; } .cms-menu { z-index: 80; background: #b0bec7; width: 192px; -webkit-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; -moz-box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; box-shadow: rgba(0, 0, 0, 0.9) 0 0 3px; } .cms-menu a { text-decoration: none; } -.cms-menu .cms-panel-content { width: 191px; /* 8x24 - 1 */ overflow-x: hidden; overflow-y: auto; } +.cms-menu .cms-panel-content { width: 191px; /* 8x24 - 1 */ overflow-x: hidden; overflow-y: auto; position: relative !important; top: auto !important; left: auto !important; } .cms-menu.collapsed { width: 40px; cursor: auto; z-index: 1000; } .cms-menu.collapsed .cms-panel-header { width: 30px; } .cms-menu.collapsed .cms-panel-header span { display: none; } @@ -783,6 +783,9 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-menu.collapsed .cms-menu-list li { width: 100%; float: left; } .cms-menu.collapsed .cms-menu-list li span.text { display: none; } .cms-menu.collapsed .cms-menu-list li ul { display: none; } +.cms-menu.collapsed .cms-login-status { height: 16px; } +.cms-menu.collapsed .cms-login-status span { display: none; } +.cms-menu.collapsed .cms-logo { height: 24px; } .cms-menu.collapsed.cms-panel .cms-panel-content { display: block; } .cms-menu-list li { /* Style applied to the menu flyout only when the collapsed setting */ } diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss index bebd6798f..64cdfa622 100644 --- a/admin/scss/_menu.scss +++ b/admin/scss/_menu.scss @@ -9,7 +9,9 @@ .cms-logo-header { background-color: darken($color-dark-bg, 10%); - position: relative; + position: relative !important; + top:auto !important; + height:auto !important; padding: 0 8px 0 4px; line-height: 24px; @@ -20,6 +22,7 @@ span { color: $color-text-light; display: block; + padding-left:26px; a { color: $color-text-dark-link; @@ -64,9 +67,7 @@ .cms-login-status { border-top: 1px solid $color-dark-separator; - height: 24px; - padding: 7px 4px 0 4px; - overflow: hidden; + padding: 7px 4px; line-height: 16px; font-size: $font-base-size - 1; @@ -94,6 +95,9 @@ width: ($grid-x * 24) - 1; /* 8x24 - 1 */ overflow-x: hidden; overflow-y: auto; + position: relative !important; + top:auto !important; + left:auto !important; } &.collapsed { @@ -124,6 +128,17 @@ } } + .cms-login-status { + height:16px; + span { + display:none; + } + } + + .cms-logo { + height:24px; + } + &.cms-panel .cms-panel-content { display: block; // override panel defaults }