diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-03-27 18:11:57 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-03-27 20:42:06 +0300 |
| commit | 798b2e87b9bd49843c6929da93066fab111f1498 (patch) | |
| tree | a1c2afab39e425d17dcf9d870a0ea5496276aae8 /apps/theming | |
| parent | f1f113c5232f6c191a431140624b0fe4e44770ce (diff) | |
Fix light primary button styling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/theming.scss | 7 | ||||
| -rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/UtilTest.php | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index ae0e7ad2f8b..928c54bc105 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -84,10 +84,6 @@ $invert: luma($color-primary) > 0.6; @include icon-color('checkbox-mark', 'actions', $color-white, 1, true); } } - /* Always give primary button a border for light primary colors */ - .primary { - border-color: $color-border !important; - } } @else { #appmenu:not(.inverted) svg { filter: none; @@ -214,11 +210,12 @@ input.primary, &.primary:not(:disabled) { background-color: var(--color-background-dark); color: var(--color-main-text); - border: 1px solid var(--color-background-darker); + border-color: var(--color-text-lighter); &:hover, &:focus, &:active { background-color: var(--color-background-darker); color: var(--color-main-text); + border-color: var(--color-text); } } } diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php index 775b588c781..332d7556551 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -74,7 +74,7 @@ class CapabilitiesTest extends TestCase { 'slogan' => 'slogan', 'color' => '#FFFFFF', 'color-text' => '#000000', - 'color-element' => '#dddddd', + 'color-element' => '#aaaaaa', 'logo' => 'http://absolute/logo', 'background' => 'http://absolute/background', 'background-plain' => false, diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php index d0263e11224..a36c7330681 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -105,7 +105,7 @@ class UtilTest extends TestCase { public function testElementColorOnBrightBackground() { $elementColor = $this->util->elementColor('#ffffff'); - $this->assertEquals('#dddddd', $elementColor); + $this->assertEquals('#aaaaaa', $elementColor); } public function testGenerateRadioButtonWhite() { |