Grey color for menu as default and edited hlavicka-s-uvodnym-blokom.n…

…jk page
trexima · Oct 15, 2021 · 802011a · 802011a
1 parent 5e9f092
commit 802011a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 47 deletions.
diff --git a/app/views/komponenty/examples/exampleIntroBlock1.njk b/app/views/komponenty/examples/exampleIntroBlock1.njk
@@ -1,45 +1,45 @@
 {% from "../../../../src/idsk/components/intro-block/macro.njk" import idskIntroBlock %}
-{{ idskIntroBlock({ 
+{{ idskIntroBlock({
     bottomMenu: [
     {
-      item:"Eurofondy", 
-      href:"#"}, 
+      item:"Eurofondy",
+      href:"#"},
     {
       item:"Kontakty",
       href:"#"
-    }, 
+    },
     {
       item:"Informatizácia",
       href:"#"
-    }, 
-    { 
+    },
+    {
       item:"Investície",
       href:"#"
-    }, 
+    },
     {
       item:"O ministerstve",
       href:"#"
     }],
     sideMenu: [
     {
-      item:"O Eurofondoch", 
-      href:"#"}, 
+      item:"O Eurofondoch",
+      href:"#"},
     {
       item:"Aktuality",
       href:"#"
-    }, 
+    },
     {
       item:"O Ministerstve",
       href:"#"
-    }, 
-    { 
+    },
+    {
       item:"Aktuálne výzvy",
       href:"#"
-    }, 
+    },
     {
       item:"Dokumenty",
       href:"#"
     }],
-    classBackground: "app-pane-grey",
+    classBackground: "app-pane-transparent",
     searchEnabled: true
-})}}
+})}}
diff --git a/app/views/komponenty/examples/exampleIntroBlock3.njk b/app/views/komponenty/examples/exampleIntroBlock3.njk
@@ -20,6 +20,5 @@
       item:"Dokumenty",
       href:"#"
     }],
-  classBackground: "app-pane-grey",
   searchEnabled: true
 })}}
diff --git a/app/views/vzory/hlavicka-s-uvodnym-blokom.njk b/app/views/vzory/hlavicka-s-uvodnym-blokom.njk
@@ -5,6 +5,14 @@
 
 {% set pageName = "Hlavička s úvodným blokom" %}
 
+{% block styles %}
+  <style>
+    #main-content {
+      padding-top: 0;
+    }
+  </style>
+{% endblock %}
+
 {% block skipLink %}
     {{ idskSkipLink({
         href: '#main-content',
@@ -82,63 +90,54 @@
             link: "#",
             text: "Twitter"
         }
-    ]    
-}) }}
-{% endblock %}
-
-{% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-    { text: ' ID-SK frontend', href: '/' + legacyQuery },
-    { text: pageName }
     ]
-  }) }}
+}) }}
 {% endblock %}
 
 {% block content %}
-  {{ idskIntroBlock({ 
+  {{ idskIntroBlock({
     bottomMenu: [
     {
-      item:"Eurofondy", 
-      href:"#"}, 
+      item:"Eurofondy",
+      href:"#"},
     {
       item:"Kontakty",
       href:"#"
-    }, 
+    },
     {
       item:"Informatizácia",
       href:"#"
-    }, 
-    { 
+    },
+    {
       item:"Investície",
       href:"#"
-    }, 
+    },
     {
       item:"O ministerstve",
       href:"#"
     }],
     searchEnabled:"true",
     sideMenu: [
     {
-      item:"Aktuálne výzvy", 
-      href:"#"}, 
+      item:"Aktuálne výzvy",
+      href:"#"},
     {
       item:"Dokumenty",
       href:"#"
-    }, 
+    },
     {
       item:"O eurofondoch",
       href:"#"
-    }, 
-    { 
+    },
+    {
       item:"Aktuality",
       href:"#"
-    }, 
+    },
     {
       item:"O ministerstve",
       href:"#"
     }]
 })}}
 {% endblock %}
 
-{% block footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/app/views/vzory/homepage.njk b/app/views/vzory/homepage.njk
@@ -221,7 +221,6 @@
 
 {% block content %}
   {{ idskIntroBlock({
-    classBackground: "app-pane-grey",
     mainTitleLinkLabel: "viac o ministerstve",
     bottomMenu: [
       {

diff --git a/src/idsk/components/intro-block/intro-block.scss b/src/idsk/components/intro-block/intro-block.scss
@@ -30,12 +30,6 @@
             }
         }
 
-        div.app-pane-grey {
-          @include mq($from: desktop) {
-            background-color: govuk-colour("light-grey");
-          }
-        }
-
         .govuk-grid-column-one-third-from-desktop {
             @include mq($from: desktop){
                width: calc(33.3333% - 50px);
@@ -104,6 +98,10 @@
             margin-left: govuk-spacing(8);
         }
 
+        @include mq($from: desktop) {
+          background-color: govuk-colour("light-grey");
+        }
+
         @include mq($until: tablet) {
           padding: 0 govuk-spacing(3);
         }
@@ -220,6 +218,10 @@
       }
     }
 
+    .app-pane-transparent{
+      background-color: transparent;
+    }
+
     .app-pane-blue {
         .govuk-heading-l,
         .govuk-heading-s,