Skip to content

Commit

Permalink
Merge pull request #128 from Voog/126_127_design_improvements
Browse files Browse the repository at this point in the history 
Add various design improvements
  • Loading branch information
@PeeterPaal
PeeterPaal authored May 24, 2022
2 parents 71da86d + a52dc7b commit 67e0aab
Show file tree
Hide file tree
Showing 12 changed files with 114 additions and 27 deletions.
5 changes: 4 additions & 1 deletion components/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
</div>
<div class="tbl-cell">

<div class="formatted">{% xcontent name="footer" %}</div>
<div class="formatted">
{%- assign footer_content_title_tooltip = "content_tooltip_all_pages_same_language" | lce -%}
{% xcontent name="footer" title_tooltip=footer_content_title_tooltip %}
</div>

<div class="voog-reference">
{% loginblock %}
Expand Down
4 changes: 2 additions & 2 deletions components/template-meta.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
{% endfor %}
{% endif %}
{% else %}
{% if og_obj.image? %}
{% assign og_image = og_obj.image.for-width-1200 %}
{% if og_obj.og_image? %}
{% assign og_image = og_obj.og_image.for-width-1200 %}
{% endif %}
{% endif %}

Expand Down
47 changes: 44 additions & 3 deletions layouts/auto_generated_product.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@

{%- assign gallery_content_size = gallery_content_html | strip | size -%}

{%- capture product_social_html -%}
{%- unless editmode -%}
{%- xcontent name="product-social" -%}
{%- endunless -%}
{%- endcapture -%}

{%- assign product_social_size = product_social_html | strip | size -%}

<div class="holder">
{% include "header" %}

Expand Down Expand Up @@ -57,7 +65,14 @@
</div>
{%- if gallery_content_size > 0 or editmode -%}
<section class="content-formatted js-product-gallery mar_t-16" data-search-indexing-allowed="true">
{% content bind=product name="gallery" %}
{%- assign gallery_title = "gallery" | lce -%}
{%- assign gallery_title_tooltip = "content_tooltip_additional_images" | lce -%}
{% content
bind=product
name="gallery"
title=gallery_title
title_tooltip=gallery_title_tooltip
%}
</section>
{%- endif -%}
</div>
Expand Down Expand Up @@ -88,7 +103,26 @@
<div class="buy-btn-content js-buy-btn-content">
{% include "buy-button" %}
</div>
{% content bind=product %}

{%- if editmode or product_social_size > 0 -%}
<div class="product-cross-page-info">
{%- assign cross_page_info_title = "cross_page_info" | lce -%}
{%- assign cross_page_info_title_tooltip = "content_tooltip_all_pages_same_type" | lce -%}
{% xcontent
name="product-social"
title=cross_page_info_title
title_tooltip=cross_page_info_title_tooltip
%}
</div>
{%- endif -%}

{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
{% content
bind=product
title=content_default_title
title_tooltip=content_default_title_tooltip
%}
</section>
</div>
</div>
Expand All @@ -97,7 +131,14 @@
<section
class="content-product-wide content-formatted"
data-search-indexing-allowed="true">
{% content bind=product name="content" %}
{%- assign bottom_content_title = "additional_content" | lce -%}
{%- assign bottom_content_title_tooltip = "content_tooltip_additional_information" | lce -%}
{% content
bind=product
name="content"
title=bottom_content_title
title_tooltip=bottom_content_title_tooltip
%}
</section>
{%- endif -%}
</div>
Expand Down
11 changes: 10 additions & 1 deletion layouts/blog_article.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@
<section class="post-content">
<div class="post-excerpt cfx formatted" {{ edy_intro_edit_text }}>{% editable article.excerpt %}</div>
<div class="post-body cfx formatted">{% editable article.body %}</div>
<div class="post-body cfx formatted">{% content name="additional_body" bind="Article" %}</div>
<div class="post-body cfx formatted">
{%- assign bottom_content_title = "additional_content" | lce -%}
{%- assign bottom_content_title_tooltip = "content_tooltip_additional_information" | lce -%}
{% content
name="additional_body"
bind="Article"
title=bottom_content_title
title_tooltip=bottom_content_title_tooltip
%}
</div>

{% if editmode or article.tags.size > 0 %}
<div class="post-tags">
Expand Down
19 changes: 17 additions & 2 deletions layouts/common_page.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,24 @@
<div class="wrap">

<div class="content formatted cfx">
<div class="content-header">{% contentblock name="content_header" publish_default_content="true" %}<h1>{{ page.title }}</h1>{% endcontentblock %}</div>
<div class="content-header">
{%- assign page_title_content_title = "title" | lce -%}
{%- assign page_title_content_title_tooltip = "content_tooltip_current_page_title" | lce -%}
{% contentblock
name="content_header"
publish_default_content="true"
title=page_title_content_title
title_tooltip=page_title_content_title_tooltip
%}
<h1>{{ page.title }}</h1>
{% endcontentblock %}
</div>
{% include "submenu" %}
<div class="content-body" {{ edy_intro_edit_text }}>{% content %}</div>
<div class="content-body">
{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
</div>
</div>
</div>
</div>
Expand Down
10 changes: 8 additions & 2 deletions layouts/feature_page.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<div class="holder">

{% include "header" %}
{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}

<main class="main" data-search-indexing-allowed="true">
<div class="main-inner">
Expand All @@ -20,7 +22,9 @@
<div class="background-color js-background-color"></div>
<div class="inner js-background-type {{ content_left_bg_type }}">
<div class="align-middle">
<div class="content formatted cfx" {{ edy_intro_edit_text }}>{% content %}</div>
<div class="content formatted cfx">
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
</div>
</div>
</div>
</div>
Expand All @@ -30,7 +34,9 @@
<div class="background-color js-background-color"></div>
<div class="inner js-background-type {{ content_right_bg_type }}">
<div class="align-middle">
<div class="content formatted cfx">{% content name="default" %}</div>
<div class="content formatted cfx">
{% content name="default" title=content_default_title title_tooltip=content_default_title_tooltip %}
</div>
</div>
</div>
</div>
Expand Down
10 changes: 8 additions & 2 deletions layouts/product.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,21 @@
{%- endif -%}
</div>
<section class="content-body content-formatted mar_0-32 mar_t-32" data-search-indexing-allowed="true">
{% content name="gallery" %}
{%- assign gallery_title = "gallery" | lce -%}
{%- assign gallery_title_tooltip = "content_tooltip_additional_images" | lce -%}
{% content name="gallery" title=gallery_title title_tooltip=gallery_title_tooltip %}
</section>
</div>

<div class="flex_row-2--item-50">
<div class="mar_0-32 flex_col t-sticky">
<section class="content-body content-formatted js-buy-btn-content"
data-search-indexing-allowed="true">
{% contentblock %}{{ "write_product_description_here" | lc: editor_locale }}{% endcontentblock %}
{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
{% contentblock title=content_default_title title_tooltip=content_default_title_tooltip %}
{{ "write_product_description_here" | lc: editor_locale }}
{% endcontentblock %}
</section>
</div>
</div>
Expand Down
13 changes: 11 additions & 2 deletions layouts/product_list.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,23 @@

<div class="content formatted cfx">
<div class="content-header" data-search-indexing-allowed="true">
{% contentblock name="content_header" publish_default_content="true" %}
{%- assign page_title_content_title = "title" | lce -%}
{%- assign page_title_content_title_tooltip = "content_tooltip_current_page_title" | lce -%}
{% contentblock
name="content_header"
publish_default_content="true"
title=page_title_content_title
title_tooltip=page_title_content_title_tooltip
%}
<h1>{{ page.title }}</h1>
{% endcontentblock %}
</div>
{% include 'menu-breadcrumbs' %}
{% include 'product-list-block' %}
<div class="product-list-content" data-search-indexing-allowed="true">
{% content %}
{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
</div>
</div>
</div>
Expand Down
6 changes: 0 additions & 6 deletions sources/stylesheets/_general.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2083,12 +2083,6 @@ $header-inner-height: 28px;
clear: both;
}

.edy-empty-bordered {
.content-half & {
padding: 63px 40px 57px
}
}

@media screen and (max-width: $break-medium) {

blockquote {
Expand Down
6 changes: 5 additions & 1 deletion sources/stylesheets/layouts/_auto-generated-product.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@
margin-bottom: 12px;
}

.product-cross-page-info {
margin-bottom: 32px;
}

.product-content {
.product-image {
.editmode & {
cursor: pointer;
}
}

.without-image .item-top {
background-image: url("../assets/ico-placeholder.svg");
background-size: 40px;
Expand Down
8 changes: 4 additions & 4 deletions stylesheets/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2383,10 +2383,6 @@ body {
clear: both;
}

.content-half .edy-empty-bordered {
padding: 63px 40px 57px;
}

@media screen and (max-width: 600px) {
blockquote {
font-size: 36px;
Expand Down Expand Up @@ -3793,6 +3789,10 @@ body {
margin-bottom: 12px;
}

.item-page .product-cross-page-info {
margin-bottom: 32px;
}

.editmode .item-page .product-content .product-image {
cursor: pointer;
}
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/main.min.css
View file

Large diffs are not rendered by default.

0 comments on commit 67e0aab

Please sign in to comment.