From f1df43ca4a06f62d18687c7dc8c5001bcf2cfbbf Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 4 Nov 2019 18:21:07 +0200 Subject: [PATCH] Removes gray hue from text on buttons --- dmp-frontend/src/assets/scss/blue-theme.scss | 237 +++++++++---------- 1 file changed, 111 insertions(+), 126 deletions(-) diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss index 52e4e8d81..41868c1f7 100644 --- a/dmp-frontend/src/assets/scss/blue-theme.scss +++ b/dmp-frontend/src/assets/scss/blue-theme.scss @@ -1,84 +1,70 @@ -@import 'app/ui/misc/navigation/navigation.component.scss'; -@import '~@angular/material/theming'; // @import '../../../node_modules/@angular/material/theming'; +@import "app/ui/misc/navigation/navigation.component.scss"; +@import "~@angular/material/theming"; // @import '../../../node_modules/@angular/material/theming'; $app-blue-theme-primary-palette: ( - 50: #e2eef1, - 100: #b6d5dc, - 200: #86bac4, - 300: #559eac, - 400: #30899b, - 500: #0c7489, - 600: #0a6c81, - 700: #086176, - 800: #06576c, - 900: #034459, - A100: #8bddff, - A200: #58cfff, - A400: #25c0ff, - A700: #0bb9ff, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: white, - 400: white, - 500: $white-87-opacity, - 600: $white-87-opacity, - 700: $white-87-opacity, - 800: $white-87-opacity, - 900: $white-87-opacity, - A100: $black-87-opacity, - A200: white, - A400: white, - A700: $white-87-opacity, - ), + 50: #e2eef1, + 100: #b6d5dc, + 200: #86bac4, + 300: #559eac, + 400: #30899b, + 500: #0c7489, + 600: #0a6c81, + 700: #086176, + 800: #06576c, + 900: #034459, + A100: #8bddff, + A200: #58cfff, + A400: #25c0ff, + A700: #0bb9ff, + contrast: ( + 50: #000000, + 100: #000000, + 200: #000000, + 300: #000000, + 400: #ffffff, + 500: #ffffff, + 600: #ffffff, + 700: #ffffff, + 800: #ffffff, + 900: #ffffff, + A100: #000000, + A200: #000000, + A400: #ffffff, + A700: #ffffff + ) ); $app-blue-theme-accent-palette: ( - 50 : #e0f6f3, - 100 : #b3e8e2, - 200 : #80d9cf, - 300 : #4dc9bc, - 400 : #26bead, - 500 : #00b29f, - 600 : #00ab97, - 700 : #00a28d, - 800 : #009983, - 900 : #008a72, - A100 : #b6fff0, - A200 : #83ffe6, - A400 : #50ffdc, - A700 : #36ffd7, - // 50: #fce4ec, - // 100: #f8bbd0, - // 200: #f48fb1, - // 300: #f06292, - // 400: #ec407a, - // 500: #e91e63, - // 600: #d81b60, - // 700: #c2185b, - // 800: #ad1457, - // 900: #880e4f, - // A100: #ff80ab, - // A200: #ff4081, - // A400: #f50057, - // A700: #c51162, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: $black-87-opacity, - 400: $black-87-opacity, - 500: white, - 600: white, - 700: $white-87-opacity, - 800: $white-87-opacity, - 900: $white-87-opacity, - A100: $black-87-opacity, - A200: white, - A400: white, - A700: white, - ) + 50: #e0f6f3, + 100: #b3e8e2, + 200: #80d9cf, + 300: #4dc9bc, + 400: #26bead, + 500: #00b29f, + 600: #00ab97, + 700: #00a28d, + 800: #009983, + 900: #008a72, + A100: #b6fff0, + A200: #83ffe6, + A400: #50ffdc, + A700: #36ffd7, + contrast: ( + 50: #000000, + 100: #000000, + 200: #000000, + 300: #000000, + 400: #000000, + 500: #ffffff, + 600: #ffffff, + 700: #000000, + 800: #000000, + 900: #000000, + A100: #000000, + A200: #ffffff, + A400: #ffffff, + A700: #ffffff + ) ); $app-blue-theme-primary: mat-palette($app-blue-theme-primary-palette); @@ -86,71 +72,70 @@ $app-blue-theme-accent: mat-palette($app-blue-theme-accent-palette, A200, A100, $app-blue-theme-warn: mat-palette($mat-red); $app-blue-theme-background: ( - status-bar: map_get($mat-grey, 300), - app-bar: map_get($mat-grey, 100), - background: map_get($mat-grey, 50), - hover: rgba(black, 0.04), - card: white, - dialog: white, - disabled-button: rgba(black, 0.12), - raised-button: white, - focused-button: $dark-focused, - selected-button: map_get($mat-grey, 300), - selected-disabled-button: map_get($mat-grey, 400), - disabled-button-toggle: map_get($mat-grey, 200), - unselected-chip: map_get($mat-grey, 300), - disabled-list-option: map_get($mat-grey, 200), + status-bar: map_get($mat-grey, 300), + app-bar: map_get($mat-grey, 100), + background: map_get($mat-grey, 50), + hover: rgba(black, 0.04), + card: white, + dialog: white, + disabled-button: rgba(black, 0.12), + raised-button: white, + focused-button: $dark-focused, + selected-button: map_get($mat-grey, 300), + selected-disabled-button: map_get($mat-grey, 400), + disabled-button-toggle: map_get($mat-grey, 200), + unselected-chip: map_get($mat-grey, 300), + disabled-list-option: map_get($mat-grey, 200) ); $app-blue-theme-foreground: ( - base: black, - divider: $dark-dividers, - dividers: $dark-dividers, - disabled: $dark-disabled-text, - disabled-button: rgba(black, 0.26), - disabled-text: $dark-disabled-text, - hint-text: $dark-disabled-text, - secondary-text: $dark-secondary-text, - icon: rgba(black, 0.54), - icons: rgba(black, 0.54), - text: rgba(black, 0.87), - slider-min: rgba(black, 0.87), - slider-off: rgba(black, 0.26), - slider-off-active: rgba(black, 0.38), + base: black, + divider: $dark-dividers, + dividers: $dark-dividers, + disabled: $dark-disabled-text, + disabled-button: rgba(black, 0.26), + disabled-text: $dark-disabled-text, + hint-text: $dark-disabled-text, + secondary-text: $dark-secondary-text, + icon: rgba(black, 0.54), + icons: rgba(black, 0.54), + text: rgba(black, 0.87), + slider-min: rgba(black, 0.87), + slider-off: rgba(black, 0.26), + slider-off-active: rgba(black, 0.38) ); $custom-theme: ( - primary: $app-blue-theme-primary, - accent: $app-blue-theme-accent, - warn: $app-blue-theme-warn, - is-dark: false, - foreground: $app-blue-theme-foreground, - background: $app-blue-theme-background, + primary: $app-blue-theme-primary, + accent: $app-blue-theme-accent, + warn: $app-blue-theme-warn, + is-dark: false, + foreground: $app-blue-theme-foreground, + background: $app-blue-theme-background ); $custom-typography: mat-typography-config( - $font-family: 'Lato, regular', - $headline: mat-typography-level(32px, 48px, 700), - $body-1: mat-typography-level(16px, 24px, 500) + $font-family: "Lato, regular", + $headline: mat-typography-level(32px, 48px, 700), + $body-1: mat-typography-level(16px, 24px, 500) ); .blue-theme { - @include mat-core(); + @include mat-core(); - @include angular-material-theme($custom-theme); - @include navigation-component-theme($custom-theme); + @include angular-material-theme($custom-theme); + @include navigation-component-theme($custom-theme); - // Override typography CSS classes (e.g., mat-h1, mat-display-1, mat-typography, etc.). - @include mat-base-typography($custom-typography); + // Override typography CSS classes (e.g., mat-h1, mat-display-1, mat-typography, etc.). + @include mat-base-typography($custom-typography); - // Override typography for a specific Angular Material components. - @include mat-checkbox-typography($custom-typography); + // Override typography for a specific Angular Material components. + @include mat-checkbox-typography($custom-typography); - // Override typography for all Angular Material, including mat-base-typography and all components. - @include angular-material-typography($custom-typography); - //If you're using Material's theming, you can also pass in your typography config to the mat-core mixin: - - // Override the typography in the core CSS. - @include mat-core($custom-typography); + // Override typography for all Angular Material, including mat-base-typography and all components. + @include angular-material-typography($custom-typography); + //If you're using Material's theming, you can also pass in your typography config to the mat-core mixin: + // Override the typography in the core CSS. + @include mat-core($custom-typography); }