Fix actions color

This commit is contained in:
eugene-sinitsyn 2020-03-10 17:48:17 +03:00
parent bff9d5236b
commit acd65e6884
5 changed files with 27 additions and 24 deletions

View file

@ -0,0 +1,15 @@
@import '~@angular/material/theming';
@mixin angular-material() {
@include mat-core();
@include nb-for-theme(material-dark) {
$custom-dark-theme: mat-dark-theme(mat-palette($mat-pink), mat-palette($mat-blue-grey));
@include angular-material-theme($custom-dark-theme);
}
@include nb-for-theme(material-light) {
$custom-light-theme: mat-light-theme(mat-palette($mat-indigo), mat-palette($mat-pink));
@include angular-material-theme($custom-light-theme);
}
}

View file

@ -375,8 +375,6 @@ $theme: (
footer-text-color: text-basic-color,
footer-text-highlight-color: footer-text-color,
sidebar-background-color: background-basic-color-2,
actions-icon-color: text-basic-color,
actions-text-color: text-basic-color,
material-regular-font-weight: 400,
menu-text-font-weight: material-regular-font-weight,

View file

@ -375,8 +375,6 @@ $theme: (
footer-text-color: text-alternate-color,
footer-text-highlight-color: footer-text-color,
sidebar-background-color: background-basic-color-2,
actions-icon-color: text-alternate-color,
actions-text-color: text-alternate-color,
menu-text-font-weight: 400,
menu-text-color: rgba(0, 0, 0, 0.87),

View file

@ -1,29 +1,16 @@
@import '~@angular/material/theming';
@include nb-install() {
@include nb-for-theme(material-dark) {
$custom-dark-theme: mat-dark-theme(mat-palette($mat-pink), mat-palette($mat-blue-grey));
@include angular-material-theme($custom-dark-theme);
}
@include nb-for-theme(material-light) {
$custom-light-theme: mat-light-theme(mat-palette($mat-indigo), mat-palette($mat-pink));
@include angular-material-theme($custom-light-theme);
}
@mixin material-overrides() {
@include nb-for-themes(material-dark, material-light) {
@include mat-core();
nb-layout-header {
.logo-container nb-icon {
color: nb-theme(text-control-color);
nb-actions, .logo-container {
nb-icon, .user-name {
color: nb-theme(color-basic-100) !important;
}
}
.select-button {
background-color: nb-theme(background-basic-color-3) !important;
}
}
nb-sidebar {
transition: width 0.3s;

View file

@ -13,12 +13,14 @@
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/grid';
@import './material/angular-material';
// loading progress bar theme
@import './pace.theme';
@import './layout';
@import './overrides';
@import './material/material';
@import './material/material-overrides';
// install the framework and custom global styles
@include nb-install() {
@ -31,5 +33,8 @@
// loading progress bar
@include ngx-pace-theme();
@include angular-material();
@include nb-overrides();
@include material-overrides();
};