fix: bootstrap to-rgb function

Yizack · Nov 1, 2024 · 2a0bdde · 2a0bdde
1 parent 184292a
commit 2a0bdde
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/app/assets/scss/_form.scss b/app/assets/scss/_form.scss
@@ -71,13 +71,11 @@ input:read-only:not([type="checkbox"]):hover, input:read-only:not([type="checkbo
   display: none;
 }
 
-
 .image-upload label .overlay {
   opacity: 0;
   transition: opacity 0.3s ease-in-out;
 }
 
-
 .image-upload label:hover .overlay {
   opacity: .85;
 }
@@ -86,7 +84,6 @@ input:read-only:not([type="checkbox"]):hover, input:read-only:not([type="checkbo
   cursor: pointer;
 }
 
-
 .form-check-input:checked {
   background-color: var(--bs-primary);
   border-color: var(--bs-primary);

diff --git a/app/assets/scss/_theme-dark.scss b/app/assets/scss/_theme-dark.scss
@@ -17,30 +17,30 @@ $success: #a9ffaf;
 
 @include bs.color-mode(dark) {
   --bs-body-color: #{$body-color};
-  --bs-body-color-rgb: #{to-rgb($body-color)};
+  --bs-body-color-rgb: #{bs.to-rgb($body-color)};
   --bs-primary: #{$primary};
-  --bs-primary-rgb: #{to-rgb($primary)};
+  --bs-primary-rgb: #{bs.to-rgb($primary)};
   --bs-primary-hover: #{$primary-hover};
   --bs-link-color: #{$link-color};
-  --bs-link-color-rgb: #{to-rgb($link-color)};
+  --bs-link-color-rgb: #{bs.to-rgb($link-color)};
   --bs-link-hover-color: #{$link-hover-color};
-  --bs-link-hover-color-rgb: #{to-rgb($link-hover-color)};
+  --bs-link-hover-color-rgb: #{bs.to-rgb($link-hover-color)};
   --bs-secondary: #{$accent};
-  --bs-secondary-rgb: #{to-rgb($accent)};
+  --bs-secondary-rgb: #{bs.to-rgb($accent)};
   --bs-danger-hover : #{$danger-hover};
-  --bs-danger-hover-rgb: #{to-rgb($danger-hover)};
+  --bs-danger-hover-rgb: #{bs.to-rgb($danger-hover)};
   --placeholder-color: #{$placeholder-color};
   --btn-color: #{$btn-color};
   --bs-danger: #{$danger};
-  --bs-danger-rgb: #{to-rgb($danger)};
+  --bs-danger-rgb: #{bs.to-rgb($danger)};
   --bs-dark: #{$dark};
-  --bs-dark-rgb: #{to-rgb($dark)};
+  --bs-dark-rgb: #{bs.to-rgb($dark)};
   --bs-body-bg: #{$body-bg};
-  --bs-body-bg-rgb: #{to-rgb($body-bg)};
+  --bs-body-bg-rgb: #{bs.to-rgb($body-bg)};
   --bs-tertiary-bg: #{$tertiary-bg};
-  --bs-tertiary-bg-rgb: #{to-rgb($tertiary-bg)};
+  --bs-tertiary-bg-rgb: #{bs.to-rgb($tertiary-bg)};
   --bs-success: #{$success};
-  --bs-success-rgb: #{to-rgb($success)};
+  --bs-success-rgb: #{bs.to-rgb($success)};
   --switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='#{encode-hash($primary)}'/%3e%3c/svg%3e");
 
   a {

diff --git a/app/assets/scss/_theme-light.scss b/app/assets/scss/_theme-light.scss
@@ -14,25 +14,25 @@ $success: #409b6e;
 
 @include bs.color-mode(light) {
   --bs-body-color: #{$body-color};
-  --bs-body-color-rgb: #{to-rgb($body-color)};
+  --bs-body-color-rgb: #{bs.to-rgb($body-color)};
   --bs-primary: #{$primary};
-  --bs-primary-rgb: #{to-rgb($primary)};
+  --bs-primary-rgb: #{bs.to-rgb($primary)};
   --bs-primary-hover: #{$primary-hover};
   --bs-link-color: #{$link-color};
-  --bs-link-color-rgb: #{to-rgb($link-color)};
+  --bs-link-color-rgb: #{bs.to-rgb($link-color)};
   --bs-link-hover-color: #{$link-hover-color};
-  --bs-link-hover-color-rgb: #{to-rgb($link-hover-color)};
+  --bs-link-hover-color-rgb: #{bs.to-rgb($link-hover-color)};
   --bs-secondary: #{$accent};
-  --bs-secondary-rgb: #{to-rgb($accent)};
+  --bs-secondary-rgb: #{bs.to-rgb($accent)};
   --bs-danger: #{$danger};
-  --bs-danger-rgb: #{to-rgb($danger)};
+  --bs-danger-rgb: #{bs.to-rgb($danger)};
   --bs-danger-hover : #{$danger-hover};
-  --bs-danger-hover-rgb: #{to-rgb($danger-hover)};
+  --bs-danger-hover-rgb: #{bs.to-rgb($danger-hover)};
   --placeholder-color: #{$placeholder-color};
   --btn-color: #{$btn-color};
   --bs-dark: var(--bs-body-color);
   --bs-dark-rgb: var(--bs-body-color-rgb);
   --bs-success: #{$success};
-  --bs-success-rgb: #{to-rgb($success)};
+  --bs-success-rgb: #{bs.to-rgb($success)};
   --switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='#{encode-hash($primary)}'/%3e%3c/svg%3e");
 }
diff --git a/app/assets/scss/app.scss b/app/assets/scss/app.scss
@@ -1,6 +1,6 @@
-@use "main";
 @use "theme-light";
 @use "theme-dark";
+@use "main";
 @use "transitions";
 @use "backgrounds";
 @use "buttons";