Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add various design improvements #128

Merged
merged 3 commits into from
May 24, 2022
Merged

Add various design improvements #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ce8a5b
Use obj.og_image method for OG image
PeeterPaal May 24, 2022
d3d9eca
Add titles & tooltips to various content areas
PeeterPaal May 24, 2022
7e2bc72
Fix two column common page paddings
PeeterPaal May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion components/footer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<footer class="footer">
<div class="content-formatted">{% xcontent name="footer" %}</div>
<div class="content-formatted">
{%- assign footer_content_title = "footer" | lce -%}
{%- assign footer_content_title_tooltip = "content_tooltip_all_pages_same_language" | lce -%}
{% xcontent name="footer" title=footer_content_title title_tooltip=footer_content_title_tooltip %}
</div>
<div class="voog-reference">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div>
{% if page.private? %}
<div class="signout-btn-margin"></div>
Expand Down
4 changes: 2 additions & 2 deletions components/template-meta.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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
46 changes: 43 additions & 3 deletions layouts/auto_generated_product.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,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 -%}

<body class="common-page">
<div class="container js-container">
{% include "header" %}
Expand Down Expand Up @@ -56,7 +64,14 @@
</div>
{%- if gallery_content_size > 0 or editmode -%}
<section class="content-formatted content-gallery js-product-gallery" 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 @@ -86,7 +101,25 @@
{% 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 @@ -95,7 +128,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
10 changes: 7 additions & 3 deletions layouts/blog___news.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@

<main class="content" role="main">
<div class="content-inner">
<section class="content-body content-formatted post-intro-content" data-search-indexing-allowed="true" {{ edy_intro_edit_text }}>{% content %}</section>

<section class="content-body content-formatted post-intro-content" data-search-indexing-allowed="true">
{%- 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 %}
</section>

{% addbutton %}

{% for article in articles %}
<article class="post">
<div class="post-left">
Expand Down
15 changes: 12 additions & 3 deletions layouts/blog_article.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@
</header>

<section class="post-content">
<div class="post-excerpt content-formatted" {{ edy_intro_edit_text }}>{% editable article.excerpt %}</div>
<div class="post-excerpt content-formatted">{% editable article.excerpt %}</div>
<div class="post-body content-formatted">{% editable article.body %}</div>
<div class="post-body content-formatted">{% content name="additional_body" bind="Article" %}</div>
<div class="post-body content-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>
</section>
</article>

Expand Down Expand Up @@ -83,7 +92,7 @@

{% include "footer" %}
</div>

{% include "site-signout" %}
{% include "javascripts" %}
{% include "edicy-tools" %}
Expand Down
6 changes: 5 additions & 1 deletion layouts/common_page.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

<main class="content" role="main">
<div class="content-inner{% if has_children %} with-submenu{% endif %}">
<section class="content-body content-formatted" {{ edy_intro_edit_text }}>{% content %}</section>
<section class="content-body content-formatted">
{%- 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 %}
</section>
</div>
</main>

Expand Down
9 changes: 6 additions & 3 deletions layouts/common_page_two_column.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@
{% endunless %}

<main class="content two-columns" role="main">
{%- assign content_default_title = "content" | lce -%}
{%- assign content_default_title_tooltip = "content_tooltip_specific_page" | lce -%}

{% if editmode or content_default_has_content %}
<div class="content-left{% if has_children and editmode != true %} with-submenu{% endif %}{% unless editmode or content_right_has_content %} left-full{% endunless %}">
<section class="content-formatted" {{ edy_intro_edit_text }}>
{% content %}
<section class="content-formatted">
{% content title=content_default_title title_tooltip=content_default_title_tooltip %}
</section>
</div>
{% endif %}

{% if editmode or content_right_has_content %}
<div class="content-right{% if has_children %} with-padding{% endif %}{% unless editmode or content_default_has_content %} right-full{% endunless %}">
<section class="content-formatted">
{% content name="content_right" %}
{% content name="content_right" title=content_default_title title_tooltip=content_default_title_tooltip %}
</section>
</div>
{% endif %}
Expand Down
6 changes: 5 additions & 1 deletion layouts/front_page.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
{% if cover_image != '' or editmode %}<div class="background-image stretch js-bgpicker-cover-image"{{ cover_image_style }}></div>{% endif %}
{% if cover_color != '' or editmode %}<div class="background-color stretch js-bgpicker-cover-color"{{ cover_color_style }}></div>{% endif %}
<div class="content-inner js-content-inner js-background-type {{ front_page_content_cover_type }}">
<section class="content-body content-formatted" {{ edy_intro_edit_text }}>{% content %}</section>
<section class="content-body content-formatted">
{%- 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 %}
</section>
</div>
</main>
{% include "footer" %}
Expand Down
10 changes: 8 additions & 2 deletions layouts/product.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,21 @@
{%- endif -%}
</div>
<section class="content-body content-formatted mar_0-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
6 changes: 4 additions & 2 deletions layouts/product_list.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
<div class="content-inner{% if has_children %} with-submenu{% endif %}">
{% include "menu-breadcrumbs" %}
{% include "product-list-block" %}
<section class="content-body content-formatted" data-search-indexing-allowed="true" {{ edy_intro_edit_text }}>
{% content %}
<section class="content-body content-formatted" data-search-indexing-allowed="true">
{%- 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 %}
</section>
</div>
</main>
Expand Down
1 change: 1 addition & 0 deletions sources/stylesheets/content/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
}

.content-right {
padding: 43px 50px;
// TODO: Maybe there's a better way to style Google Maps?
iframe {
display: block !important;
Expand Down
4 changes: 0 additions & 4 deletions sources/stylesheets/editmode.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@

// Two columns view custom content area (right)
.content-right {
.edy-empty-bordered {
padding: 251px 40px 252px;
}

.edy-texteditor-view {
min-height: 525px;
}
Expand Down
4 changes: 4 additions & 0 deletions sources/stylesheets/layouts/_auto-generated-product.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
margin: 0 4px;
}
}

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

.dark-background {
Expand Down
3 changes: 0 additions & 3 deletions stylesheets/editmode.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
min-height: 36px;
}

.content-right .edy-empty-bordered {
padding: 251px 40px 252px;
}
.content-right .edy-texteditor-view {
min-height: 525px;
}
2 changes: 1 addition & 1 deletion stylesheets/editmode.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.edy-texteditor-view{min-height:36px}.content-right .edy-empty-bordered{padding:251px 40px 252px}.content-right .edy-texteditor-view{min-height:525px}
.edy-texteditor-view{min-height:36px}.content-right .edy-texteditor-view{min-height:525px}
6 changes: 6 additions & 0 deletions stylesheets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2251,6 +2251,9 @@ body.search-open {
padding: 33px 20px;
}
}
.content .content-right {
padding: 43px 50px;
}
.content .content-right iframe {
display: block !important;
width: 100% !important;
Expand Down Expand Up @@ -2704,6 +2707,9 @@ body.search-open {
.product-content .product-price-divider {
margin: 0 4px;
}
.product-content .product-cross-page-info {
margin-bottom: 32px;
}

.dark-background .edy-product-widget-filter-sort,
.dark-background .edy-product-widget-filter-search-input {
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/main.min.css
View file
Open in desktop

Large diffs are not rendered by default.