mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix light primary button styling 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2019-03-27 16:11:57 +01:00
parent f1f113c523
commit 798b2e87b9
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/theming/css/theming.scss
View File

@ -84,10 +84,6 @@ $invert: luma($color-primary) > 0.6;
@include icon-color('checkbox-mark', 'actions', $color-white, 1, true); @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 { } @else {
#appmenu:not(.inverted) svg { #appmenu:not(.inverted) svg {
filter: none; filter: none;
@ -214,11 +210,12 @@ input.primary,
&.primary:not(:disabled) { &.primary:not(:disabled) {
background-color: var(--color-background-dark); background-color: var(--color-background-dark);
color: var(--color-main-text); color: var(--color-main-text);
border: 1px solid var(--color-background-darker); border-color: var(--color-text-lighter);
&:hover, &:focus, &:active { &:hover, &:focus, &:active {
background-color: var(--color-background-darker); background-color: var(--color-background-darker);
color: var(--color-main-text); color: var(--color-main-text);
border-color: var(--color-text);
} }
} }
} }

2
apps/theming/tests/CapabilitiesTest.php
View File

@ -74,7 +74,7 @@ class CapabilitiesTest extends TestCase {
'slogan' => 'slogan', 'slogan' => 'slogan',
'color' => '#FFFFFF', 'color' => '#FFFFFF',
'color-text' => '#000000', 'color-text' => '#000000',
'color-element' => '#dddddd', 'color-element' => '#aaaaaa',
'logo' => 'http://absolute/logo', 'logo' => 'http://absolute/logo',
'background' => 'http://absolute/background', 'background' => 'http://absolute/background',
'background-plain' => false, 'background-plain' => false,

2
apps/theming/tests/UtilTest.php
View File

@ -105,7 +105,7 @@ class UtilTest extends TestCase {
public function testElementColorOnBrightBackground() { public function testElementColorOnBrightBackground() {
$elementColor = $this->util->elementColor('#ffffff'); $elementColor = $this->util->elementColor('#ffffff');
$this->assertEquals('#dddddd', $elementColor); $this->assertEquals('#aaaaaa', $elementColor);
} }
public function testGenerateRadioButtonWhite() { public function testGenerateRadioButtonWhite() {