From 3f06deb9a2bee372da54d7b6021187cd823c3476 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Thu, 3 Apr 2014 16:49:42 -0400 Subject: [PATCH 1/2] Removed comma characters from stylesheet as they caused 500 error. Removed webkit-appearance none from select elements. Added initial scale 1. --- assets/timber.scss.liquid | 18 ++++++++++++------ layout/theme.liquid | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index 934ab464f..b74cd74ac 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -204,9 +204,8 @@ $pull: false; clear: both; } +body {background-color: pink;} - -/* You do not need to edit anything from this line onward; csswizardry-grids is good to go. Happy griddin’! */ $class-type: unquote("."); @if $use-silent-classes == true { @@ -230,13 +229,13 @@ $class-type: unquote("."); } @if $breakpoint-found == false{ - @warn "Breakpoint ‘#{$media-query}’ does not exist"; + @warn "Breakpoint '#{$media-query}' does not exist"; } } /** - * Drop relative positioning into silent classes which can’t take advantage of + * Drop relative positioning into silent classes which can't take advantage of * the `[class*="push--"]` and `[class*="pull--"]` selectors. */ @mixin silent-relative() { @@ -252,7 +251,7 @@ $class-type: unquote("."); /** * 1. Allow the grid system to be used on lists. * 2. Remove any margins and paddings that might affect the grid system. - * 3. Apply a negative `margin-left` to negate the columns’ gutters. + * 3. Apply a negative `margin-left` to negate the columns' gutters. */ #{$class-type}grid, #{$class-type}grid-uniform { @@ -677,7 +676,6 @@ select { font-weight: 300; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: 100%; - -webkit-appearance: none; } h1, h2, h3, h4, h5, h6, @@ -864,6 +862,14 @@ img.auto, form { margin-bottom: $gutter; } + +.btn, +button, +input, +textarea { + -webkit-appearance: none; +} + input, textarea, select, diff --git a/layout/theme.liquid b/layout/theme.liquid index de14c7b19..9a4c7f1aa 100755 --- a/layout/theme.liquid +++ b/layout/theme.liquid @@ -25,7 +25,7 @@ - + {{ 'timber.scss.css' | asset_url | stylesheet_tag }} From e4eb7a7cfb02ba719984553da60c218718059e58 Mon Sep 17 00:00:00 2001 From: Carson Shold Date: Thu, 3 Apr 2014 16:52:07 -0400 Subject: [PATCH 2/2] Updated to v1.1.2 --- assets/timber.scss.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid index b74cd74ac..5762b31aa 100755 --- a/assets/timber.scss.liquid +++ b/assets/timber.scss.liquid @@ -1,5 +1,5 @@ /* -* Shopify Timber v1.0 +* Shopify Timber v1.1.2 * Copyright 2014 Shopify Inc. * Author Carson Shold @cshold * Built with Sass - http://sass-lang.com/