Merge branch 'dev' into dev-primo-rest-labels-full-text

vufind-org · Nov 29, 2024 · c44edb0 · c44edb0
2 parents 62ff326 + 0715d34
commit c44edb0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -128,6 +128,7 @@ module.exports = function(grunt) {
           }
         ],
         options: {
+          excludes: ['important'],
           replacements: [
             // Activate SCSS
             {

diff --git a/themes/bootstrap3/scss/components/cookie-consent/core/components/consent-modal.scss b/themes/bootstrap3/scss/components/cookie-consent/core/components/consent-modal.scss
@@ -689,7 +689,7 @@ $cc-footer-links-gap: 1.3rem !default;
             max-width: none!important;
             min-width: auto!important;
             border-left: none!important;
-            border-top: 1px solid var(--cc-separator-border-color !important);
+            border-top: 1px solid var(--cc-separator-border-color)!important;
         }
 
         .cm__btn + .cm__btn,

diff --git a/themes/bootstrap3/scss/components/cookie-consent/core/components/preferences-modal.scss b/themes/bootstrap3/scss/components/cookie-consent/core/components/preferences-modal.scss
@@ -1000,6 +1000,6 @@ $cc-service-toggle-knob-icon-width: 1.7px !default;
     }
 
     .show--preferences #cc-main .cc--anim .pm{
-        transform: translateY(0 !important);
+        transform: translateY(0)!important;
     }
 }
diff --git a/themes/bootstrap5/scss/components/cookie-consent/core/components/consent-modal.scss b/themes/bootstrap5/scss/components/cookie-consent/core/components/consent-modal.scss
@@ -689,7 +689,7 @@ $cc-footer-links-gap: 1.3rem !default;
             max-width: none!important;
             min-width: auto!important;
             border-left: none!important;
-            border-top: 1px solid var(--cc-separator-border-color !important);
+            border-top: 1px solid var(--cc-separator-border-color)!important;
         }
 
         .cm__btn + .cm__btn,

diff --git a/themes/bootstrap5/scss/components/cookie-consent/core/components/preferences-modal.scss b/themes/bootstrap5/scss/components/cookie-consent/core/components/preferences-modal.scss
@@ -1000,6 +1000,6 @@ $cc-service-toggle-knob-icon-width: 1.7px !default;
     }
 
     .show--preferences #cc-main .cc--anim .pm{
-        transform: translateY(0 !important);
+        transform: translateY(0)!important;
     }
 }