Skip to content
This repository has been archived by the owner on Aug 30, 2018. It is now read-only.

Collection description under title #169

Merged
merged 1 commit into from
Aug 5, 2014
Merged

Collection description under title #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions assets/timber.scss.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ hr {

/*================ Section Headers ================*/
.section-header {
margin-bottom: $gutter/2;
margin-bottom: $gutter/1.5;
}

@include at-query ($min, $large) {
Expand All @@ -884,6 +884,10 @@ hr {
width: 100%;
}

.section-header--title {
margin-bottom: $gutter/2.5;
}

.section-header--left {
display: table-cell;
vertical-align: middle;
Expand All @@ -899,7 +903,7 @@ hr {
display: table-cell;
vertical-align: middle;
text-align: right;
width: 325px;
width: 335px;

@include at-query ($max, $medium) {
margin-bottom: $gutter;
Expand All @@ -908,9 +912,6 @@ hr {
}

.section-header--right {
@include at-query ($max, $medium) {
margin-top: -0.4em; // don't exceed h1 margin-bottom
}

.form-horizontal,
.collection-view {
Expand Down Expand Up @@ -997,6 +998,10 @@ hr {
}
}

.rte-header {
margin-bottom: 0;
}

/*============================================================================
#Links and Buttons
==============================================================================*/
Expand Down
9 changes: 0 additions & 9 deletions snippets/collection-sidebar.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@

{% endcomment %}

{% comment %}
Show the description for the current collection
{% endcomment %}
{% if collection.description.size > 0 %}
<div class="rte">
{{ collection.description }}
</div>
{% endif %}

{% comment %}
Product types in the current collection
- List all of the shop's types with collections.all.all_types
Expand Down
23 changes: 20 additions & 3 deletions templates/collection.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,32 @@

<div class="grid-item large--three-quarters">

{% comment %}
Different markup if a collection description exists
{% endcomment %}
{% if collection.description != blank %}
<header class="section-header">
<h1 class="section-header--title">{{ collection.title }}</h1>
<div class="rte rte--header">
{{ collection.description }}
</div>
</header>
<hr>
<div class="section-header">
<div class="section-header--right">
{% include 'collection-sorting' %}
{% include 'collection-views' %}
</div>
</div>
{% else %}
<header class="section-header">
<h1 class="section-header--left">{{ collection.title }}</h1>
<h1 class="section-header--title section-header--left">{{ collection.title }}</h1>
<div class="section-header--right">

{% include 'collection-sorting' %}
{% include 'collection-views' %}

</div>
</header>
{% endif %}

{% comment %}
Use class grid-uniform to have evenly sized columns clear
Expand Down