From 2ba0239c7edfcceced9f15880efa0943063a71f7 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Thu, 6 Nov 2014 10:34:12 -0500 Subject: [PATCH 1/5] Removed unneeded sass selector characters --- assets/timber.scss.liquid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index 9c1532d6a..a85c2967b 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -979,7 +979,7 @@ hr { } } - & > div { + > div { margin-bottom: $gutter / 2; } @@ -1734,7 +1734,7 @@ label.error { table-layout: fixed; width: 100%; - & > .grid-item { + > .grid-item { float: none; display: table-cell; vertical-align: middle; @@ -1804,7 +1804,7 @@ label.error { display: block; } - & > li { + > li { position: relative; display: inline-block; From 8af1928eabd7d79a792bd200efb4cef3caf32a6e Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Thu, 6 Nov 2014 10:57:41 -0500 Subject: [PATCH 2/5] Converted grid-item to grid__item. Styleguide IDs in customer area --- assets/timber.scss.liquid | 22 ++-- layout/theme.liquid | 9 +- snippets/ajax-cart-template.liquid | 14 +-- snippets/collection-grid-item.liquid | 2 +- snippets/collection-list-item.liquid | 2 +- snippets/footer.liquid | 6 +- snippets/product-grid-item.liquid | 2 +- snippets/product-list-item.liquid | 8 +- snippets/search-result-grid.liquid | 2 +- snippets/search-result.liquid | 4 +- templates/article.liquid | 20 +-- templates/blog.liquid | 4 +- templates/cart.liquid | 34 +++--- templates/collection.liquid | 10 +- templates/collection.list.liquid | 8 +- templates/customers/account.liquid | 4 +- templates/customers/activate_account.liquid | 12 +- templates/customers/addresses.liquid | 128 ++++++++++---------- templates/customers/login.liquid | 14 +-- templates/customers/order.liquid | 4 +- templates/customers/register.liquid | 18 +-- templates/customers/reset_password.liquid | 10 +- templates/index.liquid | 32 ++--- templates/page.contact.liquid | 18 +-- templates/page.liquid | 2 +- templates/product.liquid | 6 +- templates/search.liquid | 2 +- 27 files changed, 198 insertions(+), 199 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index a85c2967b..a541233cf 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -267,9 +267,9 @@ input[type="search"]::-webkit-search-decoration { /*============================================================================ #Grid Setup - - Based on csswizardry grid, but with floated columns and a fixed gutter size + - Based on csswizardry grid, but with floated columns, a fixed gutter size, and BEM classes - Breakpoints defined above, under #Breakpoint and Grid Variables - - Note the inclusion of .grid-uniform to take care of clearfixes on evenly sized grid-items + - Note the inclusion of .grid-uniform to take care of clearfixes on evenly sized grid items ==============================================================================*/ $responsive: true; $mobile-first: true; @@ -283,8 +283,8 @@ $pull: false; @include clearfix; } -/* Manual grid-item clearfix */ -.grid-item.clear { +/* Manual grid__item clearfix */ +.grid__item.clear { clear: both; } @@ -340,7 +340,7 @@ $class-type: unquote("."); margin-left: -$gridGutter; } -#{$class-type}grid-item { +#{$class-type}grid__item { float: left; min-height: 1px; padding-left: $gridGutter; @@ -360,7 +360,7 @@ $class-type: unquote("."); direction: rtl; text-align: left; - > #{$class-type}grid-item { + > #{$class-type}grid__item { direction: ltr; text-align: left; float: right; @@ -372,7 +372,7 @@ $class-type: unquote("."); @extend #{$class-type}grid; margin-left: 0; - > #{$class-type}grid-item { + > #{$class-type}grid__item { padding-left: 0; } } @@ -1197,8 +1197,8 @@ svg:not(:root) { } img.auto, -.grid-item img, -.grid-item iframe { +.grid__item img, +.grid__item iframe { max-width: 100%; } @@ -1734,7 +1734,7 @@ label.error { table-layout: fixed; width: 100%; - > .grid-item { + > .grid__item { float: none; display: table-cell; vertical-align: middle; @@ -2088,7 +2088,7 @@ label.error { table-layout: fixed; width: 100%; - .grid-item { + .grid__item { display: table-cell; vertical-align: middle; float: none; diff --git a/layout/theme.liquid b/layout/theme.liquid index 83805f7bf..37fe7962e 100755 --- a/layout/theme.liquid +++ b/layout/theme.liquid @@ -49,7 +49,6 @@ {% endcomment %} {% if template contains 'customers' %} {{ 'shopify_common.js' | shopify_asset_url | script_tag }} - {{ 'customer_area.js' | shopify_asset_url | script_tag }} {% endif %} {% comment %} @@ -70,7 +69,7 @@
-
+
{% comment %} Use the uploaded logo from theme settings if enabled. Site name gets precedence with H1 tag on homepage, div on other pages. @@ -93,7 +92,7 @@
{% endif %}
-
+
{% comment %} Show number of items in the cart and total cost in the /cart link @@ -140,10 +139,10 @@