summaryrefslogtreecommitdiffstats
path: root/core/css/variables.scss
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-03 11:47:45 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-06-20 19:17:06 +0200
commit71ce8f3107f6e355e1c64ecd67dc9dabcdb48346 (patch)
treec4e5fd9b3a64cdb782c7a8b9c90dcd9253cc124a /core/css/variables.scss
parent8aaf2c32729fcd0302f79546f396a07398f0d724 (diff)
downloadnextcloud-server-71ce8f3107f6e355e1c64ecd67dc9dabcdb48346.tar.gz
nextcloud-server-71ce8f3107f6e355e1c64ecd67dc9dabcdb48346.zip
Split css variables and fix url variables
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/css/variables.scss')
-rw-r--r--core/css/variables.scss31
1 files changed, 2 insertions, 29 deletions
diff --git a/core/css/variables.scss b/core/css/variables.scss
index febe79ac302..5d6c616e065 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -12,8 +12,8 @@ $color-primary-element: $color-primary;
// (Works as well: color: #000; opacity: 0.57;)
$color-text-details: #767676;
-$image-logo: '../img/logo.svg?v=1';
-$image-login-background: '../img/background.png?v=2';
+$image-logo: url('../img/logo.svg?v=1');
+$image-login-background: url('../img/background.png?v=2');
$color-loading: #969696;
$color-loading-dark: #bbbbbb;
@@ -21,33 +21,6 @@ $color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75);
$color-border: nc-darken($color-main-background, 8%);
$border-radius: 3px;
-// CSS4 Variables
-// Remember, you cannot use scss functions with css4 variables
-// All css4 variables must be fixed! Scss is a PRE processor
-// css4 variables are processed after scss!
-:root {
- --color-main-text: $color-main-text;
- --color-main-background: $color-main-background;
- --color-primary: $color-primary;
- --color-primary-text: $color-primary-text;
- --color-error: $color-error;
- --color-warning: $color-warning;
- --color-success: $color-success;
- --color-primary-element: $color-primary-element;
-
- --color-text-details: $color-text-details;
-
- --image-logo: $image-logo;
- --image-login-background: $image-login-background;
-
- --color-loading: $color-loading;
- --color-loading-dark: $color-loading-dark;
- --color-box-shadow: $color-box-shadow;
- --color-border: $color-border;
- --border-radius: $border-radius;
-}
-
-
// SCSS darken/lighten function override
@function nc-darken($color, $value) {
@return darken($color, $value);