Add new fonts, styles & footer

Voog · Nov 29, 2018 · 131e416 · 131e416
1 parent 58c47b1
commit 131e416
Show file tree

Hide file tree

Showing 38 changed files with 941 additions and 593 deletions.
diff --git a/components/blog-article-comments.tpl b/components/blog-article-comments.tpl
@@ -15,7 +15,7 @@
         {% endunless %}
 
         <div class="form_area">
-          <div class="form_fields">
+          <div class="comment_form_fields">
             <div class="form_field">
               <label for="comment-name">{% if comment_name_error %}<span class="form_field_error">{{ "comment_author_blank" | lc }}</span>{% endif %}</label>
               <input id="comment-name" class="form_field_textfield form_field_size_large" name="comment[author]" placeholder="{{ "name" | lc }}" value="{{ comment.author }}">

diff --git a/components/footer-menu.tpl b/components/footer-menu.tpl
@@ -0,0 +1,27 @@
+<div id="footer-menu" class="footer-menu">
+  <ul>
+    {% unless site.root_item.hidden? %}
+      <li>
+        {% menulink site.root_item %}
+      </li>
+    {% endunless %}
+
+    {% for item in site.visible_menuitems %}
+      {% if site.root_item.layout_title == product_list_layout or site.root_item.layout_title == product_layout %}
+        {% if editmode %}
+          {% include "menu-mobile-level-1-link" footer: true render_hidden_categories: true %}
+        {% else %}
+          {% unless show_product_related_pages_in_main_menu %}
+            {% unless item.layout_title == product_list_layout or item.layout_title == product_layout %}
+              {% include "menu-mobile-level-1-link" footer: true %}
+            {% endunless %}
+          {% else %}
+            {% include "menu-mobile-level-1-link" footer: true %}
+          {% endunless %}
+        {% endif %}
+      {% else %}
+        {% include "menu-mobile-level-1-link" footer: true %}
+      {% endif %}
+    {% endfor %}
+  </ul>
+</div>
diff --git a/components/front-page-variables.tpl b/components/front-page-variables.tpl
@@ -41,6 +41,18 @@
     {% assign feature_3_has_content = true %}
   {% endunless %}
 
+  {% if page.data.feature_image_4 == nil %}
+    {% assign feature_image_4 = images_path | append: "/logo_blue_estonia.png" %}
+  {% else %}
+    {% assign feature_image_4 = page.data.feature_image_4.url %}
+  {% endif %}
+
+  {% if page.data.feature_image_5 == nil %}
+    {% assign feature_image_5 = images_path | append: "/eu-structural-fund-logo.png" %}
+  {% else %}
+    {% assign feature_image_5 = page.data.feature_image_5.url %}
+  {% endif %}
+
   {% capture bottom_html %}{% unless editmode %}{% content name="bottom" %}{% endunless %}{% endcapture %}
   {% capture bottom_size %}{{ bottom_html | size | minus : 1 }}{% endcapture %}
   {% unless bottom_size contains "-" %}

diff --git a/components/html-head.tpl b/components/html-head.tpl
@@ -45,6 +45,8 @@
   {% include "template-cs-style-rules" %}
 {% endcustomstyle %}
 
+{% include "front-page-variables" %}
+
 {% comment %}MODERNIZR - HTML5 SUPPORT FOR OLDER BROWSERS, SVG SUPPORT DETECTION ETC{% endcomment %}
 <script src="{{ javascripts_path }}/modernizr-custom.min.js"></script>
 

diff --git a/components/menu-mobile-level-1-link.tpl b/components/menu-mobile-level-1-link.tpl
@@ -2,7 +2,7 @@
   {% menulink item %}
 
   {% if item.children? or editmode %}
-    {% if editmode %}
+    {% if editmode and footer != true %}
       {% assign sub_menu_toggler = true %}
     {% elsif item.layout_title == product_list_layout %}
       {% assign item_content_children_size = 0 %}
@@ -37,10 +37,10 @@
   {% if editmode or item.children? %}
     <ul class="sub-menu menu-level-2">
       {% for level2 in item.visible_children %}
-        {% include "menu-mobile-level-2-link" %}
+        {% include "menu-mobile-level-2-link"  %}
       {% endfor %}
 
-      {% if editmode %}
+      {% if editmode and footer != true %}
         {% if item.hidden_children.size > 0 %}
           <li class="edit-btn">{% menubtn item.hidden_children %}</li>
         {% endif %}

diff --git a/components/menu-mobile-level-2-link.tpl b/components/menu-mobile-level-2-link.tpl
@@ -1,4 +1,4 @@
-<li{% if level2.children? and level2.selected? %} class="with-children current-parent"{% elsif level2.children? %} class="with-children"{% elsif level2.selected? %} class="current-parent"{% endif %}>
+<li {% if level2.children? and level2.selected? %} class="with-children current-parent"{% elsif level2.children? %} class="with-children"{% elsif level2.selected? %} class="current-parent"{% endif %}>
   {% menulink level2 %}
 
   {% if level2.children? %}
@@ -15,7 +15,7 @@
         <li>{% menulink level3 %}</li>
       {% endfor %}
 
-      {% if editmode %}
+      {% if editmode and footer != true %}
         {% if level2.hidden_children.size > 0 %}
           <li class="edit-btn">{% menubtn level2.hidden_children %}</li>
         {% endif %}

diff --git a/components/site-footer.tpl b/components/site-footer.tpl
@@ -30,11 +30,26 @@
         </div>
       {% endif %}
 
-      <div class="footer-body content-area">
+      <div class="footer-body">
         {% if editmode %}<button class="voog-bg-picker-btn js-background-settings" data-bg-key="footer_bg" data-bg-picture-boolean="false" data-bg-default-image-color="rgb(255, 255, 255)" data-bg-color="{{ footer_bg_color }}" data-bg-color-data="{{ footer_bg_color_data_str | escape }}"></button>{% endif %}
+        <div class="footer-social content-area">{% xcontent name="footer-social" %}</div>
+        <div class="footer-content-wrap">
+          <div class="footer-logo-wrap {% if editmode != true and feature_image_4 == nil %} empty-hidden{% endif %}">
+            <div class="footer-logo">
+            {% if editmode %}
+              <div class="aspect-ratio-inner js-img-dropper-area" data-img-key="feature_image_4" data-image="{{ feature_image_4 }}"></div>
+            {% elsif feature_image_4 != "" %}
+              <div class="aspect-ratio-inner " style="background-image: url('{{ feature_image_4 }}')"></div>
+            {% endif %}
+            </div>
+          </div>
 
-        <div class="wrap">
-          <div class="inner content-area">{% xcontent name="footer" %}</div>
+          <div class="footer-menu-wrap">
+            {% include "footer-menu" %}
+          </div>
+          <div class="footer-contact-wrap">
+            <div class="footer-contact content-area">{% xcontent name="footer" %}</div>
+          </div>
         </div>
       </div>
 
@@ -52,4 +67,3 @@
 {% endif %}
 
 {% include "menu-language-popover" %}
-
diff --git a/components/site-header.tpl b/components/site-header.tpl
@@ -62,7 +62,17 @@
           <div class="wrap">
             <div class="header-body content-area" {{ edy_intro_edit_text }}>
               {% content name="header" %}
+              <div class="header-logo-wrap {% if editmode != true and feature_image_5 == nil %} empty-hidden{% endif %}">
+            <div class="header-logo">
+            {% if editmode %}
+              <div class="aspect-ratio-inner js-img-dropper-area" data-img-key="feature_image_5" data-image="{{ feature_image_5 }}"></div>
+            {% elsif feature_image_5 != "" %}
+              <div class="aspect-ratio-inner " style="background-image: url('{{ feature_image_5 }}')"></div>
+            {% endif %}
             </div>
+          </div>
+            </div>
+
           </div>
         {% elsif blog_article_page %}
           <div class="wrap js-toggle-article-type{% if photo_article %} is-photoheader{% endif %}">

diff --git a/components/template-cs-button.tpl b/components/template-cs-button.tpl
@@ -1,39 +1,4 @@
 :root {
-  /* VoogStyle
-    "pathI18n": ["button"],
-    "titleI18n": "padding",
-    "editor": "rangePicker",
-    "min": 0,
-    "max": 200,
-    "step": 1,
-    "unit": "px",
-    "scope": "global"
-  */
-  --button-padding: 30px;
-  /* VoogStyle
-    "pathI18n": ["button"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --button-font-size: 16px;
-  /* VoogStyle
-    "pathI18n": ["button"],
-    "titleI18n": "font_size",
-    "type": "button",
-    "editor": "toggleIcon",
-    "states": {
-      "on": "600",
-      "off": "400"
-    },
-    "icon": "bold",
-    "scope": "global"
-  */
-  --button-font-weight: 400;
   /* VoogStyle
     "pathI18n": ["button"],
     "titleI18n": "font_style",

diff --git a/components/template-cs-content.tpl b/components/template-cs-content.tpl
@@ -7,17 +7,6 @@
     "scope": "global"
   */
   --content-body-alignment: left;
-  /* VoogStyle
-    "pathI18n": ["content", "text"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --content-body-font-size: 18px;
   /* VoogStyle
     "pathI18n": ["content", "text"],
     "titleI18n": "line_height",

diff --git a/components/template-cs-footer.tpl b/components/template-cs-footer.tpl
@@ -1,28 +1,4 @@
 :root {
-  /* VoogStyle
-    "pathI18n": ["footer"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --footer-body-font-size: 14px;
-  /* VoogStyle
-    "pathI18n": ["footer"],
-    "titleI18n": "font_size",
-    "type": "button",
-    "editor": "toggleIcon",
-    "states": {
-      "on": "600",
-      "off": "400"
-    },
-    "icon": "bold",
-    "scope": "global"
-  */
-  --footer-body-font-weight: 400;
   /* VoogStyle
     "pathI18n": ["footer"],
     "titleI18n": "font_style",

diff --git a/components/template-cs-headings.tpl b/components/template-cs-headings.tpl
@@ -7,17 +7,6 @@
     "scope": "global"
   */
   --headings-title-text-alignment: left;
-  /* VoogStyle
-    "pathI18n": ["headings", "title"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --headings-title-font-size: 32px;
   /* VoogStyle
     "pathI18n": ["headings", "title"],
     "titleI18n": "line_height",
@@ -29,19 +18,6 @@
     "scope": "global"
   */
   --headings-title-line-height: 1.4;
-  /* VoogStyle
-    "pathI18n": ["headings", "title"],
-    "titleI18n": "font_size",
-    "type": "button",
-    "editor": "toggleIcon",
-    "states": {
-      "on": "500",
-      "off": "300"
-    },
-    "icon": "bold",
-    "scope": "global"
-  */
-  --headings-title-font-weight: 300;
   /* VoogStyle
     "pathI18n": ["headings", "title"],
     "titleI18n": "font_style",
@@ -89,17 +65,6 @@
     "scope": "global"
   */
   --headings-heading-text-alignment: left;
-  /* VoogStyle
-    "pathI18n": ["headings", "heading"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --headings-heading-font-size: 26px;
   /* VoogStyle
     "pathI18n": ["headings", "heading"],
     "titleI18n": "line_height",
@@ -111,19 +76,6 @@
     "scope": "global"
   */
   --headings-heading-line-height: 1.4;
-  /* VoogStyle
-    "pathI18n": ["headings", "heading"],
-    "titleI18n": "font_size",
-    "type": "button",
-    "editor": "toggleIcon",
-    "states": {
-      "on": "500",
-      "off": "300"
-    },
-    "icon": "bold",
-    "scope": "global"
-  */
-  --headings-heading-font-weight: 300;
   /* VoogStyle
     "pathI18n": ["headings", "heading"],
     "titleI18n": "font_style",
@@ -171,17 +123,6 @@
     "scope": "global"
   */
   --headings-subheading-text-alignment: left;
-  /* VoogStyle
-    "pathI18n": ["headings", "subheading"],
-    "titleI18n": "size",
-    "editor": "rangePicker",
-    "min": 8,
-    "max": 100,
-    "unit": "px",
-    "featured": true,
-    "scope": "global"
-  */
-  --headings-subheading-font-size: 24px;
   /* VoogStyle
     "pathI18n": ["headings", "subheading"],
     "titleI18n": "line_height",