EWPP-4045: Replace blue ecl color class and fix font-family.

openeuropa · Feb 20, 2024 · ce08054 · ce08054
1 parent 51cd0c1
commit ce08054
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/sass/components/_contextual_navigation.scss b/sass/components/_contextual_navigation.scss
@@ -2,6 +2,7 @@
 
 $outline-width: 3px !default;
 $border_right: 1px solid var(--ecl-color-neutral-60) !default;
+$font-family: null !default;
 
 .ecl-contextual-navigation {
   display: flex;
@@ -65,7 +66,7 @@ $border_right: 1px solid var(--ecl-color-neutral-60) !default;
   color: var(--ecl-color-primary);
   line-height: 1;
   padding: 0;
-  font-family: arial, sans-serif;
+  font-family: $font-family;
 
   &:hover {
     color: var(--ecl-color-dark-100);

diff --git a/sass/components/_global.scss b/sass/components/_global.scss
@@ -1,7 +1,9 @@
 // Apply global css.
 
+$font-family: null !default;
+
 body {
-  font-family: arial, sans-serif;
+  font-family: $font-family;
   margin: 0;
   padding: 0;
 }

diff --git a/sass/style-ec.scss b/sass/style-ec.scss
@@ -1,3 +1,4 @@
+@use "sass:map";
 @use '@ecl/theme-ec';
 @use '@ecl/theme-ec/theme';
 @use '@ecl/vanilla-layout-grid/mixins/breakpoints'  with (
@@ -17,7 +18,11 @@
 @use "./components/form";
 @use "./components/toolbar";
 @use "./components/wysiwyg";
-@use "./components/global";
+@use "./components/global" with (
+  $font-family: map.get(theme.$theme, 'font-family', 'default'),
+);
 @use "./components/description_list";
 @use "./components/media_iframe";
-@use "./components/contextual_navigation";
+@use "./components/contextual_navigation" with (
+  $font-family: map.get(theme.$theme, 'font-family', 'default'),
+);
diff --git a/sass/style-eu.scss b/sass/style-eu.scss
@@ -16,7 +16,9 @@
 @use "./components/form";
 @use "./components/toolbar";
 @use "./components/wysiwyg";
-@use "./components/global";
+@use "./components/global" with (
+  $font-family: map.get(theme.$theme, 'font-family', 'default'),
+);
 @use "./components/description_list" with (
   $background-color: var(--ecl-color-primary-5),
   $border-color: var(--ecl-color-primary-10),
@@ -25,4 +27,5 @@
 @use "./components/contextual_navigation" with (
   $outline-width: 2px,
   $border_right: 1px solid var(--ecl-color-dark-60),
+  $font-family: map.get(theme.$theme, 'font-family', 'default'),
 );
diff --git a/...s/compositions/ec-component-content-language-switcher/content-language-switcher.html.twig b/...s/compositions/ec-component-content-language-switcher/content-language-switcher.html.twig
@@ -74,7 +74,7 @@
           <ul style="grid-auto-flow: column; grid-template-rows: repeat(4, 1fr)" class="ecl-u-d-block ecl-u-d-m-grid ecl-unordered-list ecl-unordered-list--no-marker ecl-u-mt-xs ecl-u-type-m">
             {% for language in languages %}
               <li class="ecl-unordered-list__item ecl-u-ma-2xs">
-                {% set link_classes = language.current ? 'ecl-u-bg-blue-50 ecl-u-type-color-white ecl-u-type-bold' : '' %}
+                {% set link_classes = language.current ? 'ecl-u-bg-primary-40 ecl-u-type-color-white ecl-u-type-bold' : '' %}
                 {% include '@ecl-twig/link' with {
                   link: {
                     label: language.label,

diff --git a/tests/src/Kernel/ContentLanguageSwitcherTest.php b/tests/src/Kernel/ContentLanguageSwitcherTest.php
@@ -129,7 +129,7 @@ protected function assertUnavailableLanguage(Crawler $crawler, string $expected)
    *   The label of the language.
    */
   protected function assertSelectedLanguage(Crawler $crawler, string $expected): void {
-    $actual = $crawler->filter('div.ecl-lang-select-page div.ecl-container div.ecl-expandable__content li.ecl-unordered-list__item a.ecl-u-bg-blue-50')->text();
+    $actual = $crawler->filter('div.ecl-lang-select-page div.ecl-container div.ecl-expandable__content li.ecl-unordered-list__item a.ecl-u-bg-primary-40')->text();
     $this->assertEquals($expected, trim($actual));
   }
 
@@ -142,7 +142,7 @@ protected function assertSelectedLanguage(Crawler $crawler, string $expected): v
    *   The labels of the translations that should be rendered as links.
    */
   protected function assertTranslationLinks(Crawler $crawler, array $expected): void {
-    $elements = $crawler->filter('div.ecl-lang-select-page div.ecl-container div.ecl-expandable__content li.ecl-unordered-list__item a:not(.ecl-u-bg-blue-50)');
+    $elements = $crawler->filter('div.ecl-lang-select-page div.ecl-container div.ecl-expandable__content li.ecl-unordered-list__item a:not(.ecl-u-bg-primary-40)');
     $this->assertSameSize($expected, $elements);
 
     $actual = array_column(iterator_to_array($elements), 'nodeValue');