Merge pull request #1010 from City-of-Helsinki/UHF-9946

UHF-9946: Grants hdbt_subtheme refactoring and updating changes
City-of-Helsinki · Jun 20, 2024 · 6ea70e0 · 6ea70e0
2 parents 49507f5 + 057da89
commit 6ea70e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml
@@ -18,12 +18,8 @@ rules:
   color-named:
     - never
     - message: "HELFI: Instead of color values, please use tokens like $color-black instead"
-  string-quotes:
-    - single
-    - message: "HELFI: We use single quotes in SCSS"
   declaration-block-no-redundant-longhand-properties: null # We prefer longhand properties for clarity in SCSS
   selector-class-pattern: null # We're not too stict about selector class pattern
-  max-line-length: null # Lets not limit line length at this point
   declaration-empty-line-before:
     - never
     - message: "HELFI: No need for empty line before declaration"

diff --git a/dist/css/styles.min.css b/dist/css/styles.min.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/scss/06_components/paragraphs/_hero.scss b/src/scss/06_components/paragraphs/_hero.scss
@@ -22,6 +22,9 @@ $koro-height: 50px;
 
 .hero__image-container {
   color: var(--hdbt-color-palette--primary);
+  outline: none;
+  pointer-events: none;
+  user-select: none;
 }
 
 .hero__text-content {

diff --git a/templates/layout/page--401.html.twig b/templates/layout/page--401.html.twig
@@ -1,5 +1,6 @@
 {% embed 'page.html.twig' %}
   {% block page_content %}
+    {{ optional_messages }}
     {% embed '@hdbt/misc/container.twig' with {container_element: 'error-page-content'} %}
       {% block container_content %}
         <div class="error-page__text-container">
@@ -26,6 +27,7 @@
           {% if user_not_logged_in %}
             <h2 class="error-page__login-title">{{ 'Log in'|t({}, {'context': 'Log in block title on error pages'}) }}</h2>
           {% endif %}
+          {{ optional_login_block_description }}
           <div class="error-page__login-form">
             {{ drupal_block('user_login_block') }}
           </div>