Merge pull request #24910 from nextcloud/dependachristoph/composer/scss-1.4.0

Bump scssphp/scssphp from 1.0.3 to 1.4.0

2 files changed, 39 insertions, 38 deletions

diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index 4190c6773e1..2e0fbad5aa1 100644
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -3,55 +3,55 @@
 // 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-main-background-translucent: $color-main-background-translucent;
+	--color-main-text: #{$color-main-text};
+	--color-main-background: #{$color-main-background};
+	--color-main-background-translucent: #{$color-main-background-translucent};
 
-	--color-background-hover: $color-background-hover;
-	--color-background-dark: $color-background-dark;
-	--color-background-darker: $color-background-darker;
+	--color-background-hover: #{$color-background-hover};
+	--color-background-dark: #{$color-background-dark};
+	--color-background-darker: #{$color-background-darker};
 
-	--color-placeholder-light: $color-placeholder-light;
-	--color-placeholder-dark: $color-placeholder-dark;
+	--color-placeholder-light: #{$color-placeholder-light};
+	--color-placeholder-dark: #{$color-placeholder-dark};
 
-	--color-primary: $color-primary;
-	--color-primary-light: $color-primary-light;
-	--color-primary-text: $color-primary-text;
-	--color-primary-text-dark: $color-primary-text-dark;
-	--color-primary-element: $color-primary-element;
-	--color-primary-element-light: $color-primary-element-light;
+	--color-primary: #{$color-primary};
+	--color-primary-light: #{$color-primary-light};
+	--color-primary-text: #{$color-primary-text};
+	--color-primary-text-dark: #{$color-primary-text-dark};
+	--color-primary-element: #{$color-primary-element};
+	--color-primary-element-light: #{$color-primary-element-light};
 
-	--color-error: $color-error;
-	--color-warning: $color-warning;
-	--color-success: $color-success;
+	--color-error: #{$color-error};
+	--color-warning: #{$color-warning};
+	--color-success: #{$color-success};
 
-	--color-text-maxcontrast: $color-text-maxcontrast;
-	--color-text-light: $color-main-text;
-	--color-text-lighter: $color-text-maxcontrast;
+	--color-text-maxcontrast: #{$color-text-maxcontrast};
+	--color-text-light: #{$color-main-text};
+	--color-text-lighter: #{$color-text-maxcontrast};
 
-	--image-logo: $image-logo;
-	--image-login-background: $image-login-background;
-	--image-logoheader: $image-logoheader;
-	--image-favicon: $image-favicon;
+	--image-logo: #{$image-logo};
+	--image-login-background: #{$image-login-background};
+	--image-logoheader: #{$image-logoheader};
+	--image-favicon: #{$image-favicon};
 
-	--color-loading-light: $color-loading-light;
-	--color-loading-dark: $color-loading-dark;
+	--color-loading-light: #{$color-loading-light};
+	--color-loading-dark: #{$color-loading-dark};
 
-	--color-box-shadow: $color-box-shadow;
+	--color-box-shadow: #{$color-box-shadow};
 
-	--color-border: $color-border;
-	--color-border-dark: $color-border-dark;
-	--border-radius: $border-radius;
-	--border-radius-large: $border-radius-large;
-	--border-radius-pill: $border-radius-pill;
+	--color-border: #{$color-border};
+	--color-border-dark: #{$color-border-dark};
+	--border-radius: #{$border-radius};
+	--border-radius-large: #{$border-radius-large};
+	--border-radius-pill: #{$border-radius-pill};
 
-	--font-face: $font-face;
-	--default-font-size: $default-font-size;
+	--font-face: #{$font-face};
+	--default-font-size: #{$default-font-size};
 
-	--default-line-height: $default-line-height;
+	--default-line-height: #{$default-line-height};
 
-	--animation-quick: $animation-quick;
-	--animation-slow: $animation-slow;
+	--animation-quick: #{$animation-quick};
+	--animation-slow: #{$animation-slow};
 
-	--header-height: $header-height;
+	--header-height: #{$header-height};
 }
diff --git a/core/css/functions.scss b/core/css/functions.scss
index c34765154e4..7489e574e97 100644
--- a/core/css/functions.scss
+++ b/core/css/functions.scss
@@ -27,6 +27,7 @@
  * @return string The color without #
  */
 @function remove-hash-from-color($color) {
+	$color: unquote($color);
 	$index: str-index(inspect($color), '#');
 	@if $index {
 		$color: str-slice(inspect($color), 2);