Merge branch 'theme_light' into cybrespace

This commit is contained in:
khr 2019-05-22 16:50:23 -07:00
commit bfef28dd9f
1 changed files with 7 additions and 5 deletions

View File

@ -17,10 +17,8 @@ $action-button-color: $icon-button-inactive-color;
$about-page-text: $primary-text-color; $about-page-text: $primary-text-color;
@import 'application';
@import 'cybre-base'; @import 'cybre-base';
$gold-star: #dd9d08; $gold-star: #dd9d08;
/* cybre-specific additions */ /* cybre-specific additions */
@ -265,6 +263,10 @@ $gold-star: #dd9d08;
} }
} }
.status-card, .status-card.compact {
border-color: $ui-highlight-color;
}
// selectivity -- needs to override .column-header > button // selectivity -- needs to override .column-header > button
.column-header .column-header__back-button { .column-header .column-header__back-button {
background: $header-color; background: $header-color;
@ -793,7 +795,7 @@ button.icon-button {
color: $primary-text-color; color: $primary-text-color;
} }
.admin-wrapper .content { .admin-wrapper .content {
& > p { & > p {
color: $primary-text-color; color: $primary-text-color;
} }
@ -925,8 +927,8 @@ button.icon-button {
color: $white; color: $white;
} }
} }
.public-layout .header .brand:hover, .public-layout .header .brand:hover,
.public-layout .header .brand:focus, .public-layout .header .brand:focus,
.public-layout .header .brand:active { .public-layout .header .brand:active {
background: lighten($ui-highlight-color, 5%); background: lighten($ui-highlight-color, 5%);
} }