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 #33 from Shopify/webkit-inputs
Browse files Browse the repository at this point in the history
Webkit inputs
  • Loading branch information
cshold committed Apr 3, 2014
2 parents 6fa3d12 + e4eb7a7 commit 1f8d7ab
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
20 changes: 13 additions & 7 deletions assets/timber.scss.liquid
Original file line number Diff line number Diff line change
@@ -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/
Expand Down Expand Up @@ -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 {
Expand All @@ -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 cant 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() {
Expand All @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -864,6 +862,14 @@ img.auto,
form {
margin-bottom: $gutter;
}

.btn,
button,
input,
textarea {
-webkit-appearance: none;
}

input,
textarea,
select,
Expand Down
2 changes: 1 addition & 1 deletion layout/theme.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<!-- Helpers ================================================== -->
<link rel="canonical" href="{{ canonical_url }}">
<meta name="viewport" content="width=device-width">
<meta name="viewport" content="width=device-width,initial-scale=1">

<!-- CSS ================================================== -->
{{ 'timber.scss.css' | asset_url | stylesheet_tag }}
Expand Down

0 comments on commit 1f8d7ab

Please sign in to comment.