summaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/css/theming.scss5
-rw-r--r--apps/theming/lib/Util.php2
-rw-r--r--apps/theming/tests/CapabilitiesTest.php2
-rw-r--r--apps/theming/tests/UtilTest.php2
4 files changed, 8 insertions, 3 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 9e55680470c..4a5b0e1aa27 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -71,6 +71,11 @@
@include icon-color('checkbox-mark', 'actions', $color-white, 1, true);
}
}
+ #body-user {
+ .primary {
+ border: 1px solid transparent;
+ }
+ }
} @else {
#appmenu:not(.inverted) svg {
filter: none;
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index b72cc5b8996..b17382334d0 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -79,7 +79,7 @@ class Util {
public function elementColor($color) {
$l = $this->calculateLuminance($color);
if($l>0.8) {
- return '#555555';
+ return '#dddddd';
}
return $color;
}
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 31e0ae79970..775b588c781 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' => '#555555',
+ 'color-element' => '#dddddd',
'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 247bcbae0b2..61d1dc48301 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('#555555', $elementColor);
+ $this->assertEquals('#dddddd', $elementColor);
}
public function testGenerateRadioButtonWhite() {