From 46b0bb2d6c9f4e3ad5b6ad45d9f87b2d345d989e Mon Sep 17 00:00:00 2001 From: Jina Bolton Date: Sat, 26 Jul 2014 23:42:13 -0700 Subject: [PATCH] Add normalize gem and remove related styles --- Gemfile | 5 ++++- Gemfile.lock | 4 +++- source/assets/css/components/_buttons.scss | 5 ++++- source/assets/css/foundation/_block.scss | 7 ------- source/assets/css/foundation/_code.scss | 1 - source/assets/css/foundation/_forms.scss | 22 ++-------------------- source/assets/css/foundation/_inline.scss | 4 ---- source/assets/css/foundation/_media.scss | 5 ----- source/assets/css/foundation/_site.scss | 6 +----- source/assets/css/foundation/_tables.css | 4 ---- source/assets/css/sass.css.scss | 1 + 11 files changed, 15 insertions(+), 49 deletions(-) diff --git a/Gemfile b/Gemfile index 6819634..e4e4150 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,6 @@ -source "https://rubygems.org" +# If you have OpenSSL installed, we recommend updating +# the following line to use "https" +source 'http://rubygems.org' gem "rake" gem "rack" @@ -10,6 +12,7 @@ group :development do # gem "middleman-favicon-maker" gem "middleman-livereload" gem "middleman-syntax" + gem "normalize-rails", :require => false gem "redcarpet" gem "susy", "2.0.0.alpha.4" gem "breakpoint" diff --git a/Gemfile.lock b/Gemfile.lock index a6402c3..9d7838c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) @@ -70,6 +70,7 @@ GEM middleman-core (~> 3.0) rouge (~> 0.3.0) multi_json (1.9.0) + normalize-rails (3.0.1) rack (1.5.2) rack-contrib (1.1.0) rack (>= 0.9.1) @@ -119,6 +120,7 @@ DEPENDENCIES middleman (~> 3.1.5) middleman-livereload middleman-syntax + normalize-rails rack rack-contrib rack-rewrite diff --git a/source/assets/css/components/_buttons.scss b/source/assets/css/components/_buttons.scss index b7e8897..b8cfcf0 100644 --- a/source/assets/css/components/_buttons.scss +++ b/source/assets/css/components/_buttons.scss @@ -1,4 +1,7 @@ -.button { @extend %button; } +.button { + @extend %reset-margin; + @extend %button; +} .primary { background-color: $color-primary; diff --git a/source/assets/css/foundation/_block.scss b/source/assets/css/foundation/_block.scss index eef9d49..6da7620 100644 --- a/source/assets/css/foundation/_block.scss +++ b/source/assets/css/foundation/_block.scss @@ -1,10 +1,3 @@ -footer, -header, -main, -nav, -section, -figure { display: block; } - %block-text, p { @extend %reset-margin; diff --git a/source/assets/css/foundation/_code.scss b/source/assets/css/foundation/_code.scss index 7ec3380..108b3ea 100644 --- a/source/assets/css/foundation/_code.scss +++ b/source/assets/css/foundation/_code.scss @@ -36,7 +36,6 @@ pre { @include trailer; @include rhythm(.5, .5, .5, .5); @include bleed(1em); - overflow-y: auto; margin: auto 0 25px; // Account for some code outputs that place code tags in pre tags diff --git a/source/assets/css/foundation/_forms.scss b/source/assets/css/foundation/_forms.scss index 7fa7a83..ce61c46 100644 --- a/source/assets/css/foundation/_forms.scss +++ b/source/assets/css/foundation/_forms.scss @@ -13,20 +13,7 @@ label { } input, -%button { - @extend %reset-margin; - font: { - size: inherit; - family: inherit; - } - line-height: normal; - background-image: none; - - &::-moz-focus-inner { - border: 0; - padding: 0; - } -} +%button { background-image: none; } input[type="text"], %button { @@ -69,7 +56,6 @@ input { &[type="radio"], &[type="checkbox"] { @extend %tab-focus; - box-sizing: border-box; margin: 4px 0 0 { top: 1px \9; } @@ -104,11 +90,7 @@ input { } } -button { - @extend %button; - -webkit-appearance: button; - text-transform: none; -} +button { @extend %button; } %tab-focus { outline: thin dotted $color-text; diff --git a/source/assets/css/foundation/_inline.scss b/source/assets/css/foundation/_inline.scss index 7edc85a..03714c5 100644 --- a/source/assets/css/foundation/_inline.scss +++ b/source/assets/css/foundation/_inline.scss @@ -1,6 +1,5 @@ a { text-decoration: none; - background: transparent; color: $color-text-link; &:visited { color: $color-text-link-visited; } @@ -8,9 +7,6 @@ a { &:hover, &:focus { color: $color-text-link-hover; } - &:active, - &:hover { outline: 0; } - &:focus { @extend %tab-focus; } } diff --git a/source/assets/css/foundation/_media.scss b/source/assets/css/foundation/_media.scss index cab095b..1e0037b 100644 --- a/source/assets/css/foundation/_media.scss +++ b/source/assets/css/foundation/_media.scss @@ -2,7 +2,6 @@ img { display: inline-block; max-width: 100%; height: auto; - border: 0; vertical-align: middle; } @@ -10,8 +9,6 @@ hr { $new-spacing: ($base-line-height - 1) / $base-line-height; @include leader($new-spacing); @include trailer($new-spacing); - -moz-box-sizing: content-box; - box-sizing: content-box; display: block; padding: 0; height: 1px; @@ -20,8 +17,6 @@ hr { } } -svg:not(:root) { overflow: hidden; } - figure { @extend %block-text; @include breakpoint($tablet-large) { max-width: 50%; } diff --git a/source/assets/css/foundation/_site.scss b/source/assets/css/foundation/_site.scss index 05ab2ca..1ff7c7d 100644 --- a/source/assets/css/foundation/_site.scss +++ b/source/assets/css/foundation/_site.scss @@ -14,7 +14,6 @@ html { @extend %text; overflow-x: hidden; - -ms-text-size-adjust: 100%; text: { rendering: optimizeLegibility; align: center; @@ -26,10 +25,7 @@ html { &.toolkit-baseline { @include debug-vertical-alignment; } } -body { - @extend %reset-margin; - background: none; -} +body { background: none; } @mixin theme-selection { background: $color-background-shade; diff --git a/source/assets/css/foundation/_tables.css b/source/assets/css/foundation/_tables.css index 16b808d..66c2a54 100644 --- a/source/assets/css/foundation/_tables.css +++ b/source/assets/css/foundation/_tables.css @@ -6,10 +6,6 @@ table { margin: { right: -$table-cell-padding; left: -$table-cell-padding; - } - border: { - collapse: collapse; - spacing: 0; } width: 100%; max-width: 100%; diff --git a/source/assets/css/sass.css.scss b/source/assets/css/sass.css.scss index 2849475..c7fb8c3 100755 --- a/source/assets/css/sass.css.scss +++ b/source/assets/css/sass.css.scss @@ -6,6 +6,7 @@ @import "compass/layout"; @import "susy"; @import "breakpoint"; +@import "normalize-rails";