Fix notifications appearance on dark header

This commit is contained in:
Toby Zerner 2015-07-18 10:07:22 +09:30
parent 0b702d8b73
commit fc3e9c353d
5 changed files with 31 additions and 19 deletions

View File

@ -17,10 +17,22 @@
margin: 0; margin: 0;
color: @muted-color; color: @muted-color;
} }
.Button { }
float: right; .Button {
margin-top: -11px; float: right;
margin-right: -11px; margin-top: -11px;
margin-right: -11px;
// The NotificationList may be displayed inside of the drawer as a
// dropdown menu – but the drawer may have .light-contents() applied to
// it. In this case we will need to reset the button's styles back to
// normal.
& when (@config-colored-header = true) {
.Button--color(@control-color, @control-bg);
&:hover {
color: @link-color;
}
} }
} }
} }

View File

@ -34,6 +34,10 @@
font-weight: bold; font-weight: bold;
margin: -2px 0; margin: -2px 0;
background: @primary-color; background: @primary-color;
color: #fff; color: @body-bg;
font-size: 13px; font-size: 13px;
& when (@config-colored-header = true) {
background: #fff;
}
} }

View File

@ -98,7 +98,7 @@
&:active, &:active,
&.active, &.active,
.open > .Dropdown-toggle& { .open > .Dropdown-toggle& {
background-color: darken(@background, 5%); background-color: darken(fadein(@background, 5%), 5%);
} }
&.disabled, &.disabled,

View File

@ -17,11 +17,7 @@
} }
.Button, .Button:hover { .Button, .Button:hover {
color: @control-color; color: @control-color;
} background: @control-bg;
.Button {
&, &:hover {
background: @control-bg;
}
} }
.Button--flat { .Button--flat {
background: transparent; background: transparent;

View File

@ -70,16 +70,16 @@
.define-header(@config-colored-header); .define-header(@config-colored-header);
.define-header(false) { .define-header(false) {
@header-bg: @body-bg; @header-bg: @body-bg;
@header-color: @primary-color; @header-color: @primary-color;
@header-control-bg: @control-bg; @header-control-bg: @control-bg;
@header-control-color: @control-color; @header-control-color: @control-color;
} }
.define-header(true) { .define-header(true) {
@header-bg: @primary-color; @header-bg: @primary-color;
@header-color: @body-bg; @header-color: @body-bg;
@header-control-bg: fade(#000, 10%); @header-control-bg: fade(#000, 10%);
@header-control-color: @body-bg; @header-control-color: @body-bg;
} }
// --------------------------------- // ---------------------------------