diff options
| -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 | ||||
| -rw-r--r-- | core/css/variables.scss | 4 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 4 |
7 files changed, 13 insertions, 8 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() { diff --git a/core/css/variables.scss b/core/css/variables.scss index b6bffea9739..34a105fccc9 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -38,8 +38,8 @@ $color-main-background: #fff !default; $color-background-dark: nc-darken($color-main-background, 7%) !default; $color-background-darker: nc-darken($color-main-background, 14%) !default; -$color-primary: #0082c9; -$color-primary-text: #ffffff; +$color-primary: #0082c9 !default; +$color-primary-text: #ffffff !default; // do not use nc-darken/lighten in case of overriding because // primary-text is independent of color-main-text $color-primary-text-dark: darken($color-primary-text, 7%) !default; diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 19734355d26..c4f89a9c63c 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -284,9 +284,9 @@ class SCSSCacher { try { $compiledScss = $scss->compile( '$webroot: \'' . $this->getRoutePrefix() . '\';' . + $this->getInjectedVariables() . '@import "variables.scss";' . '@import "functions.scss";' . - $this->getInjectedVariables() . '@import "' . $fileNameSCSS . '";'); } catch (ParserException $e) { $this->logger->error($e, ['app' => 'core']); @@ -349,7 +349,7 @@ class SCSSCacher { } $variables = ''; foreach ($this->defaults->getScssVariables() as $key => $value) { - $variables .= '$' . $key . ': ' . $value . ';'; + $variables .= '$' . $key . ': ' . $value . ' !default;'; } // check for valid variables / otherwise fall back to defaults |