diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-08-30 17:35:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 17:35:40 +0200 |
| commit | 25857c49008df3bbb799522c8c70b876ee396495 (patch) | |
| tree | e61ecc7e4d7e932f8368094cee65d8de61deb7ab /apps | |
| parent | cdc4eee27826650c22e84552ecc449e2aa3c0ab1 (diff) | |
| parent | a791bdb3abed1fe2ab1e705ede04fdb644e2d98b (diff) | |
| download | nextcloud-server-25857c49008df3bbb799522c8c70b876ee396495.tar.gz nextcloud-server-25857c49008df3bbb799522c8c70b876ee396495.zip | |
Merge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primary
Fix SCSS variable management with the theming app
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/accessibility/lib/Controller/AccessibilityController.php | 2 | ||||
| -rw-r--r-- | apps/theming/css/theming.scss | 5 | ||||
| -rw-r--r-- | apps/theming/lib/Util.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/UtilTest.php | 2 |
5 files changed, 9 insertions, 4 deletions
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) { 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() { |