diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-08-29 16:46:12 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-08-29 16:47:39 +0200 |
| commit | e8938df1986c4b52fc1f5c9afe4cc4078ea86e4c (patch) | |
| tree | c4da4127667493aac996368470b0e3832b5a69c1 | |
| parent | 27141a960ffbbeca2fcd9693ce6fac3a49991141 (diff) | |
| download | nextcloud-server-e8938df1986c4b52fc1f5c9afe4cc4078ea86e4c.tar.gz nextcloud-server-e8938df1986c4b52fc1f5c9afe4cc4078ea86e4c.zip | |
Move SCSS variable fetching before the variables.scss to properly calculate color values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/accessibility/lib/Controller/AccessibilityController.php | 2 | ||||
| -rw-r--r-- | core/css/variables.scss | 4 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 4 |
3 files changed, 5 insertions, 5 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/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 |