diff options
| author | Julius Härtl <jus@bitgrid.net> | 2017-08-11 15:11:47 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-09-04 14:30:46 +0200 |
| commit | da5662c454cbdf9e81c6ac83cc0dfe72692fd883 (patch) | |
| tree | b60b9082f707af8c3f43bf675173a0a23de027bd /apps/theming | |
| parent | 4fd3240b5f0d2f8a42675fa499c06a7f35b726fe (diff) | |
| download | nextcloud-server-da5662c454cbdf9e81c6ac83cc0dfe72692fd883.tar.gz nextcloud-server-da5662c454cbdf9e81c6ac83cc0dfe72692fd883.zip | |
Use separate element color in theming
This way we can use a grey color when the primary color is to bright
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/theming.scss | 11 | ||||
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 22e3bdc0d95..d14905f3a5c 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -60,7 +60,8 @@ } input.primary { - background-color: $color-primary; + background-color: $color-primary-element; + border: 1px solid $color-primary-text; color: $color-primary-text; } @@ -92,16 +93,16 @@ input.primary { background-color: nc-darken($color-primary, 10%); } input[type='checkbox'].checkbox--white + label:before { - border-color: nc-darken($color-primary, 40%) !important; + border-color: nc-darken($color-primary-element, 40%) !important; } input[type='checkbox'].checkbox--white:not(:disabled):not(:checked) + label:hover:before, input[type='checkbox'].checkbox--white:focus + label:before { - border-color: nc-darken($color-primary, 30%) !important; + border-color: nc-darken($color-primary-element, 30%) !important; } input[type='checkbox'].checkbox--white:checked + label:before { - border-color: nc-darken($color-primary, 30%) !important; + border-color: nc-darken($color-primary-element, 30%) !important; background-image: url('../../../core/img/actions/checkbox-mark.svg'); - background-color: nc-darken($color-primary, 30%) !important; + background-color: nc-darken($color-primary-element, 30%) !important; } } @else { #submit { diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index b10dc4b7ea8..8200957edc0 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -238,6 +238,7 @@ class ThemingDefaults extends \OC_Defaults { } $variables['color-primary'] = $this->getColorPrimary(); $variables['color-primary-text'] = $colorPrimaryText; + $variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary()); } if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') { |