Browse Source
Fix light primary button styling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/14883/head
Julius Härtl
7 years ago
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with
4 additions and
7 deletions
-
apps/theming/css/theming.scss
-
apps/theming/tests/CapabilitiesTest.php
-
apps/theming/tests/UtilTest.php
|
|
|
@ -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); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -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, |
|
|
|
|
|
|
|
@ -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() { |
|
|
|
|
