Skip to content

Commit

Permalink
BUGFIX: fixed trac 7665 - CMS Menu header now changes height dependin…
Browse files Browse the repository at this point in the history
…g on the name of the admin and greeting message. position and height were being set inline so added !important to override this.
  • Loading branch information
Jeremy Bridson committed Aug 14, 2012
1 parent ad52b8c commit c621a6d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 8 deletions.
11 changes: 7 additions & 4 deletions admin/css/screen.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 19 additions & 4 deletions admin/scss/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -20,6 +22,7 @@
span {
color: $color-text-light;
display: block;
padding-left:26px;

a {
color: $color-text-dark-link;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit c621a6d

Please sign in to comment.