Fix issue where css-prop functuon expected only one hyphen

unofficialmatt · Jan 21, 2024 · 0e8152e · 0e8152e
1 parent 0639ed7
commit 0e8152e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/dist/css/jellyfish.min.css b/dist/css/jellyfish.min.css
diff --git a/dist/js/jellyfish.min.js b/dist/js/jellyfish.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jellyfish-ui",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "author": {
     "name": "Matt Weet",
     "email": "hello@mattweet.com",

diff --git a/src/scss/abstracts/01-tools/_functions.scss b/src/scss/abstracts/01-tools/_functions.scss
@@ -151,14 +151,13 @@
   $prop: str-replace($prop, "var(--color-", "");
   $prop: str-replace($prop, ")", "");
 
-  // Work out where the hyphen is
-  $hyphen: str-index($prop, "-");
+  // Work out where the last hyphen is
+  $last-hyphen: str-index(str-reverse($prop), "-");
 
   // Get the parts of the string
-  $base: str-slice($prop, 1, $hyphen - 1);
-  $end: str-slice($prop, $hyphen + 1);
+  $base: str-slice($prop, 1, -($last-hyphen + 1));
+  $end: str-slice($prop, -($last-hyphen - 1));
 
-  // Convert the end to a number
   $end: str.to-number($end);
 
   $color: get-color-raw($base, $end);