From 696b08d8330db3310bd8efb55606fadd9d1a25fc Mon Sep 17 00:00:00 2001 From: eugene-sinitsyn Date: Mon, 9 Mar 2020 17:24:08 +0300 Subject: [PATCH] Override input styles for material themes --- .../styles/material/_material-dark.scss | 38 ++++++++++++++++++- .../styles/material/_material-light.scss | 38 ++++++++++++++++++- src/app/@theme/styles/material/_material.scss | 15 ++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/app/@theme/styles/material/_material-dark.scss b/src/app/@theme/styles/material/_material-dark.scss index 613a45a4..a0439bbb 100644 --- a/src/app/@theme/styles/material/_material-dark.scss +++ b/src/app/@theme/styles/material/_material-dark.scss @@ -391,7 +391,43 @@ $theme: ( card-border-style: none, card-background-color: color-basic-800, card-divider-color: color-basic-700, - card-border-radius: .25rem .25rem .125rem .125rem + + input-border-width: 0 0 1px 0, + input-basic-border-color: rgba(255, 255, 255, 0.7), + input-basic-focus-border-color: color-primary-focus, + input-basic-disabled-border-color: rgba(255, 255, 255, 0.7), + input-basic-hover-border-color: rgba(255, 255, 255, 0.7), + input-basic-background-color: transparent, + input-basic-focus-background-color: transparent, + input-basic-disabled-background-color: transparent, + input-basic-hover-background-color: transparent, + input-rectangle-border-radius: 0, + input-semi-round-border-radius: 0, + input-round-border-radius: 0, + input-primary-background-color: input-basic-background-color, + input-primary-focus-background-color: input-basic-focus-background-color, + input-primary-disabled-background-color: input-basic-disabled-background-color, + input-primary-hover-background-color: input-basic-hover-background-color, + input-info-background-color: input-basic-background-color, + input-info-focus-background-color: input-basic-focus-background-color, + input-info-disabled-background-color: input-basic-disabled-background-color, + input-info-hover-background-color: input-basic-hover-background-color, + input-success-background-color: input-basic-background-color, + input-success-focus-background-color: input-basic-focus-background-color, + input-success-disabled-background-color: input-basic-disabled-background-color, + input-success-hover-background-color: input-basic-hover-background-color, + input-warning-background-color: input-basic-background-color, + input-warning-focus-background-color: input-basic-focus-background-color, + input-warning-disabled-background-color: input-basic-disabled-background-color, + input-warning-hover-background-color: input-basic-hover-background-color, + input-danger-background-color: input-basic-background-color, + input-danger-focus-background-color: input-basic-focus-background-color, + input-danger-disabled-background-color: input-basic-disabled-background-color, + input-danger-hover-background-color: input-basic-hover-background-color, + input-control-background-color: input-basic-background-color, + input-control-focus-background-color: input-basic-focus-background-color, + input-control-disabled-background-color: input-basic-disabled-background-color, + input-control-hover-background-color: input-basic-hover-background-color ); $nb-themes: nb-register-theme($theme, material-dark, dark); diff --git a/src/app/@theme/styles/material/_material-light.scss b/src/app/@theme/styles/material/_material-light.scss index a5fe401f..e7958af2 100644 --- a/src/app/@theme/styles/material/_material-light.scss +++ b/src/app/@theme/styles/material/_material-light.scss @@ -390,7 +390,43 @@ $theme: ( card-border-style: none, card-divider-color: color-basic-200, - card-border-radius: .25rem .25rem .125rem .125rem + + input-border-width: 0 0 1px 0, + input-basic-border-color: rgba(0, 0, 0, 0.42), + input-basic-focus-border-color: color-primary-focus, + input-basic-disabled-border-color: rgba(0, 0, 0, 0.42), + input-basic-hover-border-color: rgba(0, 0, 0, 0.42), + input-basic-background-color: transparent, + input-basic-focus-background-color: transparent, + input-basic-disabled-background-color: transparent, + input-basic-hover-background-color: transparent, + input-rectangle-border-radius: 0, + input-semi-round-border-radius: 0, + input-round-border-radius: 0, + input-primary-background-color: input-basic-background-color, + input-primary-focus-background-color: input-basic-focus-background-color, + input-primary-disabled-background-color: input-basic-disabled-background-color, + input-primary-hover-background-color: input-basic-hover-background-color, + input-info-background-color: input-basic-background-color, + input-info-focus-background-color: input-basic-focus-background-color, + input-info-disabled-background-color: input-basic-disabled-background-color, + input-info-hover-background-color: input-basic-hover-background-color, + input-success-background-color: input-basic-background-color, + input-success-focus-background-color: input-basic-focus-background-color, + input-success-disabled-background-color: input-basic-disabled-background-color, + input-success-hover-background-color: input-basic-hover-background-color, + input-warning-background-color: input-basic-background-color, + input-warning-focus-background-color: input-basic-focus-background-color, + input-warning-disabled-background-color: input-basic-disabled-background-color, + input-warning-hover-background-color: input-basic-hover-background-color, + input-danger-background-color: input-basic-background-color, + input-danger-focus-background-color: input-basic-focus-background-color, + input-danger-disabled-background-color: input-basic-disabled-background-color, + input-danger-hover-background-color: input-basic-hover-background-color, + input-control-background-color: input-basic-background-color, + input-control-focus-background-color: input-basic-focus-background-color, + input-control-disabled-background-color: input-basic-disabled-background-color, + input-control-hover-background-color: input-basic-hover-background-color ); $nb-themes: nb-register-theme($theme, material-light, default); diff --git a/src/app/@theme/styles/material/_material.scss b/src/app/@theme/styles/material/_material.scss index 1a998400..2315d3be 100644 --- a/src/app/@theme/styles/material/_material.scss +++ b/src/app/@theme/styles/material/_material.scss @@ -30,10 +30,25 @@ } } + ngx-footer .socials { + color: nb-theme(color-basic-100) !important; + } + nb-card { + border-bottom-left-radius: 0.125rem; + border-bottom-right-radius: 0.125rem; + nb-card-header, .tabset { background-color: nb-theme(card-divider-color); } } + + [nbinput] { + font-weight: 400; + + &.status-basic:focus:hover { + border-color: nb-theme(color-primary-focus) !important; + } + } } }