Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix actions color

Browse source
This commit is contained in:
eugene-sinitsyn 2020-03-10 17:48:17 +03:00 • committed by Maksim Karatkevich
parent ef740d7b1c
commit 2c443a5bc3
5 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app/@theme/styles/material/_angular-material.scss Normal file
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);
}
}

2
src/app/@theme/styles/material/_material-dark.scss
View file

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

2
src/app/@theme/styles/material/_material-light.scss
View file

@ -375,8 +375,6 @@ $theme: (
footer-text-color: text-alternate-color, footer-text-color: text-alternate-color,
footer-text-highlight-color: footer-text-color, footer-text-highlight-color: footer-text-color,
sidebar-background-color: background-basic-color-2, 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-font-weight: 400,
menu-text-color: rgba(0, 0, 0, 0.87), menu-text-color: rgba(0, 0, 0, 0.87),

25
src/app/@theme/styles/material/_material.scss → src/app/@theme/styles/material/_material-overrides.scss
View file

@ -1,29 +1,16 @@
@import '~@angular/material/theming'; @mixin material-overrides() {
@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);
}
@include nb-for-themes(material-dark, material-light) { @include nb-for-themes(material-dark, material-light) {
@include mat-core();
nb-layout-header { nb-layout-header {
.logo-container nb-icon { nb-actions, .logo-container {
color: nb-theme(text-control-color); nb-icon, .user-name {
color: nb-theme(color-basic-100) !important;
}
} }
.select-button { .select-button {
background-color: nb-theme(background-basic-color-3) !important; background-color: nb-theme(background-basic-color-3) !important;
} }
} }
nb-sidebar { nb-sidebar {
transition: width 0.3s; transition: width 0.3s;

7
src/app/@theme/styles/styles.scss
View file

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