Merge pull request #65 from Shopify/style-updates

Style updates
Shopify · May 9, 2014 · 98e2624 · 98e2624
2 parents 8c74922 + 8da43bb
commit 98e2624
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git 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 {
@@ -1296,7 +1299,6 @@ a.btn-secondary {
   a,
   a:hover,
   a:focus {
-    color: $colorText;
     text-decoration: none;
   }
 
@@ -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;
   }
 }
 
@@ -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;

diff --git 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 %}
-    <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>
@@ -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>
 

diff --git a/templates/index.liquid b/templates/index.liquid
@@ -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>