From f3926a444d13741b7b725db04738aba3c410f223 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Tue, 6 May 2014 13:59:07 -0400 Subject: [PATCH 1/4] Less selective search bar. No logo link color removed --- assets/timber.scss.liquid | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index 2ae2202bf..88d230f02 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -1296,7 +1296,6 @@ a.btn-secondary { a, a:hover, a:focus { - color: $colorText; text-decoration: none; } @@ -1393,13 +1392,13 @@ a.btn-secondary { .input-group-field { margin-bottom: 0; } +} - .search-bar { - max-width: 300px; +.search-bar { + max-width: 300px; - @include at-query($max, $medium) { - margin: 0 auto; - } + @include at-query($max, $medium) { + margin: 0 auto; } } From 86d02055f1e16f0d190628c8d86f28a5167d1424 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Tue, 6 May 2014 14:04:57 -0400 Subject: [PATCH 2/4] Added footer colour as variable --- assets/timber.scss.liquid | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index 88d230f02..47273428f 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -104,6 +104,9 @@ $borderColor: #e5e5e5; /* Nav and dropdown link background */ $colorNav: #f6f6f6; +/* Footer */ +$colorFooterBg: #f6f6f6; + /* Helper colors */ $disabledGrey: #f6f6f6; $disabledBorder: darken($disabledGrey, 25%); @@ -644,7 +647,7 @@ $class-type: unquote("."); // #Basic Styles // ============================================================================== html { - background-color: #f6f6f6; + background-color: $colorFooterBg; } body { @@ -1407,7 +1410,7 @@ a.btn-secondary { // #Site Footer // ============================================================================== .site-footer { - background-color: #f6f6f6; + background-color: $colorFooterBg; border-top: 1px solid $borderColor; text-align: center; padding: $gutter 0; From 48c86e535eb8ad77af88afcc3dd82952d658740d Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Tue, 6 May 2014 14:09:59 -0400 Subject: [PATCH 3/4] Added timber link in footer --- snippets/footer.liquid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snippets/footer.liquid b/snippets/footer.liquid index 7fe72854c..2d55407af 100755 --- a/snippets/footer.liquid +++ b/snippets/footer.liquid @@ -45,7 +45,7 @@ Loop through available payment methods and show their icons. {% endcomment %} {% unless shop.enabled_payment_types == empty %} -

Accepted Payments

+

Accepted Payments

    {% for type in shop.enabled_payment_types %}
  • @@ -56,7 +56,7 @@ {% endunless %}

    - Timber v1.0 by Shopify
    + Timber by Shopify
    {{ powered_by_link }}

    From 8da43bb09dce11a11424283539ed615b80fb3119 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Fri, 9 May 2014 13:27:38 -0400 Subject: [PATCH 4/4] Moved empty collection state outside of collection loop --- templates/index.liquid | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/templates/index.liquid b/templates/index.liquid index bfb65417c..a479a1f67 100755 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -83,37 +83,37 @@ {% endunless %} - {% if isEmpty %} -
    -

    You don't have any collections to show here. Add some collections to go along with the default Frontpage.

    -
    -
    -
    -
    -
    - Collection Image -
    -

    Example Collection Title (3 items)

    + {% comment %}Add 1 to the current index{% endcomment %} + {% assign index = index | plus: 1 %} + {% endfor %} + + {% if isEmpty %} +
    +

    You don't have any collections to show here. Add some collections to go along with the default Frontpage.

    +
    +
    +
    +
    +
    + Collection Image
    -
    -
    - Collection Image -
    -

    Example Collection Title (13 items)

    +

    Example Collection Title (3 items)

    +
    +
    +
    + Collection Image
    -
    -
    - Collection Image -
    -

    Example Collection Title (25 items)

    +

    Example Collection Title (13 items)

    +
    +
    +
    + Collection Image
    +

    Example Collection Title (25 items)

    - {% endif %} - - {% comment %}Add 1 to the current index{% endcomment %} - {% assign index = index | plus: 1 %} - {% endfor %} +
    + {% endif %}