diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-12 10:41:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 10:41:10 +0300 |
| commit | 5981027f82fdad3c13b4340fe498bbb4d82e0353 (patch) | |
| tree | 06bb479054225d7811c58ead53ca6a5d41e54972 /core/css | |
| parent | 3aae3a54e53086e06479af2579bf6c6107908b4a (diff) | |
| parent | 9bcf90adc876c73e8a4f287bdab59ba1f271c01c (diff) | |
Merge pull request #6359 from nextcloud/12-6082
[stable12] Use separate element color in theming
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/inputs.scss | 19 | ||||
| -rw-r--r-- | core/css/variables.scss | 1 |
2 files changed, 11 insertions, 9 deletions
diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 13a164e13f2..42b9f63b7e2 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -50,7 +50,7 @@ textarea, &:focus, &.active { /* active class used for multiselect */ - border-color: $color-primary; + border-color: $color-primary-element; outline: none; } &:active { @@ -66,21 +66,21 @@ textarea, } /* Primary action button, use sparingly */ &.primary { - border: 1px solid $color-primary; - background-color: rgba($color-primary, .7); + border: 1px solid $color-primary-text; + background-color: $color-primary-element; color: $color-primary-text; cursor: pointer; &:not(:disabled) { &:hover, &:focus { - background-color: rgba($color-primary, .85); + background-color: rgba($color-primary-element, .85); } &:active { - background-color: rgba($color-primary, .7); + background-color: rgba($color-primary-element, .7); } } &:disabled { - background-color: rgba($color-primary, .7); + background-color: rgba($color-primary-element, .7); color: nc-lighten($color-main-text, 73%); } } @@ -225,15 +225,15 @@ input { } &:not(:disabled):not(:checked) + label:hover:before, &:focus + label:before { - border-color: $color-primary; + border-color: $color-primary-element; } &:checked + label:before, &.checkbox:indeterminate + label:before { /* ^ :indeterminate have a strange behavior on radio, so we respecified the checkbox class again to be safe */ box-shadow: inset 0px 0px 0px 2px $color-main-background; - background-color: $color-primary; - border-color: $color-primary + background-color: $color-primary-element; + border-color: $color-primary-element; } &:disabled + label:before { border: 1px solid nc-lighten($color-main-text, 53%); @@ -494,6 +494,7 @@ input { .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: none; background: nc-darken($color-main-background, 3%); + color: $color-primary-element; } /* Animation */ diff --git a/core/css/variables.scss b/core/css/variables.scss index 47c8e1a27f8..d12109c5298 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -5,6 +5,7 @@ $color-primary-text: #ffffff; $color-error: #e9322d; $color-warning: #ffcc44; $color-success: #46ba61; +$color-primary-element: $color-primary; @function nc-darken($color, $value) { @return darken($color, $value); |