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

Commit

Permalink
Merge pull request #65 from Shopify/style-updates
Browse files Browse the repository at this point in the history
Style updates
  • Loading branch information
cshold committed May 9, 2014
2 parents 8c74922 + 8da43bb commit 98e2624
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 36 deletions.
18 changes: 10 additions & 8 deletions assets/timber.scss.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ $borderColor: #e5e5e5;
/* Nav and dropdown link background */
$colorNav: #f6f6f6;

/* Footer */
$colorFooterBg: #f6f6f6;

/* Helper colors */
$disabledGrey: #f6f6f6;
$disabledBorder: darken($disabledGrey, 25%);
Expand Down Expand Up @@ -644,7 +647,7 @@ $class-type: unquote(".");
// #Basic Styles
// ==============================================================================
html {
background-color: #f6f6f6;
background-color: $colorFooterBg;
}

body {
Expand Down Expand Up @@ -1296,7 +1299,6 @@ a.btn-secondary {
a,
a:hover,
a:focus {
color: $colorText;
text-decoration: none;
}

Expand Down Expand Up @@ -1393,13 +1395,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;
}
}

Expand All @@ -1408,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;
Expand Down
4 changes: 2 additions & 2 deletions snippets/footer.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
Loop through available payment methods and show their icons.
{% endcomment %}
{% unless shop.enabled_payment_types == empty %}
<h4 class="text-center">Accepted Payments</h4>
<h4 class="text-center">Accepted Payments</h4>
<ul class="inline-list payment-icons text-center">
{% for type in shop.enabled_payment_types %}
<li>
Expand All @@ -56,7 +56,7 @@
{% endunless %}

<p class="text-center">
<a href="">Timber v1.0</a> by <a href="http://www.shopify.com?ref=Timber">Shopify</a><br>
<a href="http://shopify.com/timber">Timber</a> by <a href="http://www.shopify.com?ref=Timber">Shopify</a><br>
<small>{{ powered_by_link }}</small>
</p>

Expand Down
52 changes: 26 additions & 26 deletions templates/index.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -83,37 +83,37 @@

{% endunless %}

{% if isEmpty %}
<div class="grid-item">
<p>You don't have any collections to show here. <a href="/admin/custom_collections">Add some collections</a> to go along with the default Frontpage.</p>
</div>
<div class="grid-item">
<div class="grid-uniform">
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(3 items)</small></p>
{% comment %}Add 1 to the current index{% endcomment %}
{% assign index = index | plus: 1 %}
{% endfor %}

{% if isEmpty %}
<div class="grid-item">
<p>You don't have any collections to show here. <a href="/admin/custom_collections">Add some collections</a> to go along with the default Frontpage.</p>
</div>
<div class="grid-item">
<div class="grid-uniform">
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(13 items)</small></p>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(3 items)</small></p>
</div>
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(25 items)</small></p>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(13 items)</small></p>
</div>
<div class="grid-item large--one-third medium--one-half text-center">
<div class="demo-image">
Collection Image
</div>
<p><a href="/admin/custom_collections">Example Collection Title</a> <small>(25 items)</small></p>
</div>
</div>
{% endif %}

{% comment %}Add 1 to the current index{% endcomment %}
{% assign index = index | plus: 1 %}
{% endfor %}
</div>
{% endif %}

</div>

Expand Down

0 comments on commit 98e2624

Please sign in to comment.