Merge pull request #1 from raccoongang/lunyachek/RGOeX-26418/feat/cha…

…nge-cookie-banner-styles-inclusion-v2 feat: [RGOeX-26418] Compile styles
raccoongang · Mar 6, 2024 · 480073e · 480073e
2 parents ea239c6 + 46626d7
commit 480073e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,9 @@ and this project adheres to customized Semantic Versioning e.g.: `quince-rg.1`
 
 [Unreleased]
 ************
+Fixed:
+======
+* Correct the z-index, fonts and paddings of the cookie banner [RGOeX-26418]
 
 Added:
 =====

diff --git a/build/_cookie-policy-banner.css b/build/_cookie-policy-banner.css
@@ -1,16 +1,17 @@
 .edx-cookie-banner-wrapper {
   background: #f2f8fd;
   box-sizing: border-box;
+  z-index: 5;
   /** Base Styles - start **/
   text-align: left;
   line-height: 1.5;
-  font-family: Arial, sans-serif;
+  font-family: "Open Sans", Arial, sans-serif !important;
   font-size: 1rem;
   font-weight: 400;
   /** Base Styles - end **/ }
   .edx-cookie-banner-wrapper .alert {
     position: relative;
-    padding: 8px 20px; }
+    padding: 8px 20px !important; }
   .edx-cookie-banner-wrapper .alert-dismissible .close {
     position: absolute;
     top: 0;

diff --git a/build/_cookie-policy-banner.scss b/build/_cookie-policy-banner.scss
@@ -6,26 +6,27 @@ $cookie-banner-text-color: #4e4e4e !default;
 $cookie-banner-cta-base: #19291F !default;
 $cookie-banner-cta-hover: #075683 !default;
 
-$font-family-sans-serif: Arial, sans-serif !default;
+$font-family-sans-serif: "Open Sans", Arial, sans-serif;
 $small-font-size: 14px;
 
 .edx-cookie-banner-wrapper {
   background: $cookie-banner-background-color;
   box-sizing: border-box;
+  z-index: 5;
 
   /** Base Styles - start **/
   text-align: left;
   line-height: 1.5;
 
   font: {
-    family: $font-family-sans-serif;
+    family: $font-family-sans-serif !important;
     size: 1rem;
     weight: 400;
   }
 
   .alert {
     position: relative;
-    padding: 8px 20px;
+    padding: 8px 20px !important;
   }
 
   .alert-dismissible {

diff --git a/src/CookiePolicyBanner/_cookie-policy-banner.scss b/src/CookiePolicyBanner/_cookie-policy-banner.scss
@@ -6,7 +6,7 @@ $cookie-banner-text-color: #4e4e4e !default;
 $cookie-banner-cta-base: #19291F !default;
 $cookie-banner-cta-hover: #075683 !default;
 
-$font-family-sans-serif: Arial, sans-serif !default;
+$font-family-sans-serif: "Open Sans", Arial, sans-serif;
 $small-font-size: 14px;
 
 .edx-cookie-banner-wrapper {
@@ -19,14 +19,14 @@ $small-font-size: 14px;
   line-height: 1.5;
 
   font: {
-    family: $font-family-sans-serif;
+    family: $font-family-sans-serif !important;
     size: 1rem;
     weight: 400;
   }
 
   .alert {
     position: relative;
-    padding: 8px 20px;
+    padding: 8px 20px !important;
   }
 
   .alert-dismissible {