From e8938df1986c4b52fc1f5c9afe4cc4078ea86e4c Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Wed, 29 Aug 2018 16:46:12 +0200 Subject: Move SCSS variable fetching before the variables.scss to properly calculate color values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/accessibility/lib/Controller/AccessibilityController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php index 0a1d091d1c5..8f1ffa452af 100644 --- a/apps/accessibility/lib/Controller/AccessibilityController.php +++ b/apps/accessibility/lib/Controller/AccessibilityController.php @@ -149,8 +149,8 @@ class AccessibilityController extends Controller { try { $css .= $scss->compile( $imports . - '@import "variables.scss";' . $this->getInjectedVariables() . + '@import "variables.scss";' . '@import "css-variables.scss";' ); } catch (ParserException $e) { -- cgit v1.2.3 From 2bdc3b1d27d69390d21959e166816e5732f0551b Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Wed, 29 Aug 2018 16:46:37 +0200 Subject: Remove border from primary button when color is bright MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/css/theming.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'apps') 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; -- cgit v1.2.3 From 5bae5bf3ebd6001a8ddbf988714e6bf90d48d692 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Wed, 29 Aug 2018 16:46:54 +0200 Subject: Make the default element color for bright theming colors lighter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/lib/Util.php | 2 +- apps/theming/tests/UtilTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'apps') 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/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() { -- cgit v1.2.3 From a791bdb3abed1fe2ab1e705ede04fdb644e2d98b Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Thu, 30 Aug 2018 14:45:06 +0200 Subject: Fix capabilities test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/theming/tests/CapabilitiesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') 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, -- cgit v1.2.3