Merge pull request #291 from malberts/master

3.x scss fix
ProfessionalWiki · Sep 16, 2021 · 57519ff · 57519ff
2 parents ebddd34 + 5639ec7
commit 57519ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -8,6 +8,12 @@ Under development.
 * Raised minimum MediaWiki version from 1.31 to 1.35
 * Raised minimum PHP version from 7.1 to 7.4.3
 
+### Chameleon 3.4.1
+
+Released on September 16, 2021.
+
+* Fixed scssphp 1.7.0 compatibility (@thanks malberts)
+
 ### Chameleon 3.4.0
 
 Released on August 7, 2021.

diff --git a/resources/styles/_variables.scss b/resources/styles/_variables.scss
@@ -31,11 +31,11 @@ $cmln-grid-breakpoints: (
 $grid-breakpoints: $cmln-grid-breakpoints;
 
 // Global textual link colors.
-$cmln-link-format: $link-color none darken($link-color, 15%) underline !default;
+$cmln-link-format: $link-color none darken($link-color, 0.15) underline !default;
 
 $cmln-link-formats: () !default;
 $cmln-link-formats: map_merge((
-	new: theme-color("danger") none darken(theme-color("danger"), 15%) underline,
+	new: theme-color("danger") none darken(theme-color("danger"), 0.15) underline,
 	stub: $cmln-link-format,
 	extiw: $cmln-link-format,
 	external: $cmln-link-format,

diff --git a/resources/styles/themes/_light.scss b/resources/styles/themes/_light.scss
@@ -118,15 +118,15 @@ $h6-font-size:                $font-size-base * 1.0 !default;
 // Links
 $link-color: $cobalt;
 $cmln-link-formats: (
-	new: ('color': $burgundy, 'hover-color': darken($burgundy, 15%)),
+	new: ('color': $burgundy, 'hover-color': darken($burgundy, 0.15)),
 );
 
 // Navbar
 $navbar-light-color:                $chambray !default; // cmln: improved contrast
-$navbar-light-hover-color:          darken($navbar-light-color, 15%) !default;
-$navbar-light-active-color:         darken($navbar-light-color, 30%) !default;
-$navbar-light-disabled-color:       fade_out($navbar-light-color, 30%) !default;
-$navbar-light-toggler-border-color: fade_out($navbar-light-color, 50%) !default;
+$navbar-light-hover-color:          darken($navbar-light-color, 0.15) !default;
+$navbar-light-active-color:         darken($navbar-light-color, 0.3) !default;
+$navbar-light-disabled-color:       fade_out($navbar-light-color, 0.3) !default;
+$navbar-light-toggler-border-color: fade_out($navbar-light-color, 0.5) !default;
 
 $navbar-toggler-padding-y:          .1rem !default;
 $navbar-toggler-padding-x:          .5rem !default;
@@ -139,10 +139,10 @@ $body-bg:                   $white !default;
 $body-color:                $gray-900 !default;
 
 // PersonalTools
-$cmln-personal-tools-link-new: ('color': $gray-600, 'hover-color': darken($gray-600, 15%)) !default;
+$cmln-personal-tools-link-new: ('color': $gray-600, 'hover-color': darken($gray-600, 0.15)) !default;
 
 // PageTools
-$cmln-page-tools-link-new: ('color': $gray-600, 'hover-color': darken($gray-600, 15%)) !default;
+$cmln-page-tools-link-new: ('color': $gray-600, 'hover-color': darken($gray-600, 0.15)) !default;
 
 //$enable-caret:                                true !default;
 //$enable-rounded:                              true !default;