archetype 0.0.1.pre.10 → 0.0.1.pre.11

data/lib/archetype/sass_extensions/functions/ui.rb

@@ -18,11 +18,10 @@ module Archetype::SassExtensions::UI
   # - {String} the unique string
   #
   def unique(prefix = '')
-    prefix = helpers.to_str(prefix, ' ', :quotes)
+    prefix = helpers.to_str(prefix).gsub(/\A"|"\Z/, '')
     prefix = '.' if prefix == 'class'
     prefix = '#' if prefix == 'id'
-    suffix = Compass.configuration.testing ? "RANDOM_UID" : "#{Time.now.to_i}-#{rand(36**8).to_s(36)}-#{uid}"
-    return Sass::Script::String.new("#{prefix}archetype-uid-#{suffix}")
+    return Sass::Script::String.new("#{prefix}archetype-uid-#{uid}")
   end
 
   #

data/lib/archetype/sass_extensions/functions/version.rb

@@ -8,7 +8,7 @@ require 'sass/version'
 #
 module Archetype::SassExtensions::Version
   # :stopdoc:
-  COMPARATOR_PATTERN  = /(\s[neqglt]+\s|[><=!]+)/
+  COMPARATOR_PATTERN  = /([neglt]+|[><=!]+)/
   VERSION_PATTERN     = /\d+(\.\d+)*(\.[x|\*])?/
   # :startdoc:
 
@@ -21,15 +21,10 @@ module Archetype::SassExtensions::Version
   # - {String|Boolean} if no test or test is just a lookup of a framework, it returns the version of that framework, otherwise it returns the result of the test
   #
   def archetype_version(test = nil)
-    test = test.nil? ? 'archetype' : helpers.to_str(test, ' ', :quotes).downcase
-    lib = ''
-    if test.include?('compass')
-      lib = Compass::VERSION
-    elsif test.include?('sass')
-      lib = Sass::VERSION
-    else
-      lib = Archetype::VERSION
-    end
+    test = test.nil? ? 'archetype' : helpers.to_str(test).gsub(/\A"|"\Z/, '').downcase
+    lib = Archetype::VERSION
+    lib = Compass::VERSION if test.include?('compass')
+    lib = Sass::VERSION if test.include?('sass')
     # strip off any non-official versioning (e.g. pre/alpha/rc)
     lib = lib.match(VERSION_PATTERN)[0]
     result = compare_version(lib, test.match(VERSION_PATTERN), test.match(COMPARATOR_PATTERN))
@@ -60,7 +55,7 @@ private
     # check for wild cards
     wild = version.index('x')
     # check the comparison
-    comparator = ((comparator || [])[0] || 'eq').strip
+    comparator = (comparator || [])[0] || 'eq'
     eq = comparator =~ /(e|=)/
     lt = comparator =~ /(l|<)/
     gt = comparator =~ /(g|>)/

data/lib/archetype/sass_extensions/monkey_patches.rb

@@ -1,3 +1,3 @@
 %w(handle_include_loop).each do |patch|
   require "archetype/sass_extensions/monkey_patches/#{patch}"
-end
+end

data/lib/archetype/version.rb

@@ -1,3 +1,3 @@
 module Archetype
-  VERSION = '0.0.1.pre.10'
+  VERSION = '0.0.1.pre.11'
 end

data/stylesheets/archetype/_base.scss

@@ -2,7 +2,6 @@
 @import "base/normalize";
 @import "base/reset";
 @import "base/hybrid";
-@import "base/h5bp";
 
 // protect against multiple resets
 $RESET_INIT: false !default;
@@ -12,8 +11,8 @@ $RESET_INIT: false !default;
 // sets the base styles for the page (e.g. reset or normalize)
 // @mixin     base
 // @param     $exclude {List} the list of styles to exclude @see _normalize.scss and _reset.scss
-// @param     $method {String} reset method [reset|normalize|h5bp|hybrid]
-// @param     $force {Boolean} force reset to invoke; by default base() can only be invoked once, to re-invoke must pass in $force: true
+// @param     $method {String} reset method [reset|normalize|hybrid]
+// @param     $force {Bool} force reset to invoke; by default base() can only be invoked once, to re-invoke must pass in $force: true
 @mixin base($exclude: $CONFIG_RESET_EXCLUDES, $method: $CONFIG_RESET_METHOD, $force: false) {
   @if not $RESET_INIT or $force {
     $RESET_INIT: true;
@@ -21,10 +20,6 @@ $RESET_INIT: false !default;
     @if $method == normalize {
       @include base-normalize($exclude: $exclude);
     }
-    // html5 boiler plate
-    @else if $method == h5bp {
-      @include base-h5bp($exclude: $exclude);
-    }
     // hyrbid reset (reset + some normalize)
     @else if $method == hybrid {
       @include base-hybrid($exclude: $exclude);

data/stylesheets/archetype/_config.scss

@@ -40,7 +40,6 @@ $CONTENT_PLACEHOLDER:             '\0020' !default;
 $CONFIG_DISABLED_CSS:             () !default;                                                      // a list of CSS3 features to always disable when using output-style()
 $CONFIG_GENERATED_TAG_PREFIX:     x-archetype !default;                                             // the prefix for the tag name to create when using ie-pseudo method
 $CONFIG_GENERATED_TAG_CSS:        false !default;                                                   // styles to apply to the generated tag when using ie-pseudo method (use this as a way to reset styles on these tags)
-$CONFIG_GENERATED_TAG_INLINE:     true !default;                                                    // if `true` insert the styles inline on the generated tag, otherwise insert the styles in a unique css rule
 
 // z-layers
 $CONFIG_Z_INDEX_BASE:             0 !default;                                                       // the default starting layer for z-index calculations
@@ -61,7 +60,7 @@ $CONFIG_KEYFRAME_LOADERS:         archetype-loader !default;
 $CONFIG_GLYPHS_NAME:              FontAwesome !default;                                             // name for the font-face
 $CONFIG_GLYPHS_VERSION:           '0.0.1' !default;                                                 // the glyph library version number
 $CONFIG_GLYPHS_SVG_ID:            $CONFIG_GLYPHS_NAME !default;
-$CONFIG_GLYPHS_BASE_PATH:         'vendor/archetype/fontawesome-webfont' !default;                  // generic path to all glyph fonts (sans extensions)
+$CONFIG_GLYPHS_BASE_PATH:         'vendor/archetype/fontawesome-webfont' !default;                  // generic path to all glpyh fonts (sans extensions)
 $CONFIG_GLYPHS_EOT:               '#{$CONFIG_GLYPHS_BASE_PATH}.eot' !default;
 $CONFIG_GLYPHS_FILES:             font-files('#{$CONFIG_GLYPHS_BASE_PATH}.woff', '#{$CONFIG_GLYPHS_BASE_PATH}.ttf', '#{$CONFIG_GLYPHS_BASE_PATH}.svg##{$CONFIG_GLYPHS_SVG_ID}') !default;
 $CONFIG_GLYPHS_WEIGHT:            normal !default;                                                  // font-weight for glyphs
@@ -381,9 +380,3 @@ $CORE_SAFE_FONTS: (
 ); // note that this declaration isn't a `default`, but rather is enforced everytime. this can be modified (via extending $CONFIG_SAFE_FONTS)
 $CONFIG_SAFE_FONTS: () !default;
 $CONFIG_SAFE_FONTS: associative-merge($CORE_SAFE_FONTS, $CONFIG_SAFE_FONTS);
-
-$archetype-glyph-selector: false !default;
-$archetype-pseudo-selector: false !default;
-
-$CORE_GLYPH_SELECTOR_VAR: '$archetype-glyph-selector';
-$CORE_GLYPH_SELECTOR_VAR: '$archetype-pseudo-selector';

data/stylesheets/archetype/_hacks.scss

@@ -34,44 +34,33 @@
 }
 
 // proxy for ie-pseudo
-// @mixin     ie-pseudo-before
-// @param     $styles {String} the styles to apply to the pseudo-element
-// @param     $content {String} the content to insert into the element (similar to css `content` attribute)
-// @param     $name {String} the name of the element
-// @content
+// @mixin    ie-pseudo-before
+// @param    $styles {String} the styles to apply to the pseudo-element
+// @param    $content {String} the content to insert into the element (similar to css `content` attribute)
+// @param    $name {String} the name of the element
 @mixin ie-pseudo-before($styles: false, $content: false, $name: '') {
-  @include ie-pseudo($styles, $content, before, $name) {
-    @content;
-  }
+  @include ie-pseudo($styles, $content, before, $name);
 }
 
 // proxy for ie-pseudo
-// @mixin     ie-pseudo-after
-// @param     $styles {String} the styles to apply to the pseudo-element
-// @param     $content {String} the content to insert into the element (similar to css `content` attribute)
-// @param     $name {String} the name of the element
-// @content
+// @mixin    ie-pseudo-after
+// @param    $styles {String} the styles to apply to the pseudo-element
+// @param    $content {String} the content to insert into the element (similar to css `content` attribute)
+// @param    $name {String} the name of the element
 @mixin ie-pseudo-after($styles: false, $content: false, $name: '') {
-  @include ie-pseudo($styles, $content, after, $name) {
-    @content;
-  }
+  @include ie-pseudo($styles, $content, after, $name);
 }
 
 // this creates a one-type executing expression that inserts an element relative to `this` element.
 // this allows some level of support for :before/:after in IE6/7
 // inspired by http://nicolasgallagher.com/better-float-containment-in-ie/
-// @mixin     ie-pseudo
-// @param     $styles {String} the styles to apply to the pseudo-element
-// @param     $content {String} the content to insert into the element (similar to css `content` attribute)
-// @param     $placement {String} [before|after] simulate :before or :after behavior
-// @param     $name {String} the name of the element
-// @param     $uid {String} a custom, unique identifier for the generate element
-// @content
-@mixin ie-pseudo($styles: false, $content: false, $placement: before, $name: '', $uid: false) {
-  $archetype-pseudo-selector: false;
+// @mixin    ie-pseudo
+// @param    $styles {String} the styles to apply to the pseudo-element
+// @param    $content {String} the content to insert into the element (similar to css `content` attribute)
+// @param    $placement {String} [before|after] simulate :before or :after behavior
+// @param    $name {String} the name of the element
+@mixin ie-pseudo($styles: false, $content: false, $placement: before, $name: '') {
   @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
-    $uid: if($uid, $uid, unique('ie-pseudo-'));
-    $archetype-pseudo-selector: '& ##{$uid}';
     $this: 't';
     $cmd: (unquote('#{$this}.el=document.createElement("#{prefixed-tag($name)}")'));
     $method: if($placement == before, insertBefore, appendChild);
@@ -81,7 +70,7 @@
     @if $CONFIG_GENERATED_TAG_CSS {
       $styles: if($styles and $styles != nil, #{$CONFIG_GENERATED_TAG_CSS}#{$styles}, $CONFIG_GENERATED_TAG_CSS);
     }
-    @if $styles and $styles != nil and $styles != '' and $CONFIG_GENERATED_TAG_INLINE {
+    @if $styles and $styles != nil {
       // sets the icon styles on the node
       $cmd: append($cmd, unquote('#{$this}.el.style.cssText="#{$styles}"'), comma);
     }
@@ -94,28 +83,5 @@
     //  this prevents an edge case in IE crashing with an `Operation Aborted` if the node hasn't finished rendering yet
     //  http://www.nczonline.net/blog/2008/03/17/the-dreaded-operation-aborted-error/
     *zoom: expression(#{$runOnce},(function(#{$this}){setTimeout(function(){#{$cmd}})}(this)));
-
-    // if we're NOT using inline styles...
-    @if not $CONFIG_GENERATED_TAG_INLINE {
-      // output it on the generated selector
-      #{$archetype-pseudo-selector} {
-        @include to-styles(-style-string-to-list(unquote($styles)));
-        @if archetype-version('Sass >= 3.2') {
-          @content;
-        }
-      }
-    }
   }
 }
-
-// a hack that allows elements with transparent backgrounds to be focusable in IE
-// @mixin     transparent-focusable
-// @param     $url {String} an optional URL to point to an image (not required)
-// @param     $data {String} an optional data URI for a transparent image (not required)
-@mixin transparent-focusable($url: url(https://), $data: 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7') {
-  $bg: (transparent);
-  background: append($bg, $data);
-  @if $url {
-    @include target-browser(ie lte 7, background, append($bg, $url));
-  }
-}

data/stylesheets/archetype/_ui.scss

@@ -117,9 +117,9 @@
   clip: rect(1px, 1px, 1px, 1px);
 }
 
-// reverse hide-element and make the element visible again
+// revert hide element with config
 // @mixin     unhide-element
-// @see       hide-element
+// @link      http://snook.ca/archives/html_and_css/hiding-content-for-accessibility
 // @param     $position {String} value for the position property
 // @param     $height {String} value for the height property
 // @param     $width {String} value for the width property
@@ -168,11 +168,8 @@
 // @param     $size {Number} the size of the icon
 // @param     $color {Color} the color of the font
 // @param     $placement {String} where to place the icon [before|after|inline]
-// @param     $ie-styles {String} styles to apply to IE6/7 (this is needed because the faux :before isn't extendable)
-// @param     $ie-uid {String} a custom, unique identifier for the generate IE6/7 element
-// @content
-@mixin glyph-icon($icon, $size: default, $color: inherit, $placement: before, $ie-styles: false, $ie-uid: false) {
-  $archetype-glyph-selector: false;
+// @param     $ie-styles {String} styles to apply to IE6/7 (this is needed because the faux :before isn't extensible)
+@mixin glyph-icon($icon, $size: default, $color: inherit, $placement: before, $ie-styles: false) {
   $char-mapping: nil;
   $char-code: nil;
   @if $icon {
@@ -207,7 +204,6 @@
         content: $char-code;
       }
     }
-    $archetype-glyph-selector: $selector;
     @if($selector != '&' and $ie-styles != nil) {
       // support for IE6/7
       $styles: "font-family:'#{$CONFIG_GLYPHS_NAME}-#{$CONFIG_GLYPHS_VERSION}', '#{$CONFIG_GLYPHS_NAME}';font-weight:#{$CONFIG_GLYPHS_WEIGHT};font-style:#{$CONFIG_GLYPHS_STYLE};text-decoration:inherit;";
@@ -220,14 +216,7 @@
       @if($ie-styles) {
         $styles: $styles + $ie-styles;
       }
-
-      @include ie-pseudo($styles: $styles, $content: $char-code, $placement: $placement, $name: glyph, $uid: $ie-uid);
-      @if $archetype-pseudo-selector {
-        $archetype-glyph-selector: '#{$selector}, #{$archetype-pseudo-selector}';
-      }
-    }
-    #{$archetype-glyph-selector} {
-      @content;
+      @include ie-pseudo($styles: $styles, $content: $char-code, $placement: $placement, $name: glyph);
     }
   }
 }

data/stylesheets/archetype/base/_h5bp.scss

@@ -6,7 +6,7 @@
   /* ==========================================================================
   Base styles: opinionated defaults
   ========================================================================== */
-
+  
   html,
   button,
   input,
@@ -14,32 +14,32 @@
   textarea {
     color: #222;
   }
-
+  
   body {
     font-size: 1em;
     line-height: 1.4;
   }
-
+  
   /*
   * Remove text-shadow in selection highlight: h5bp.com/i
   * These selection declarations have to be separate.
   * Customize the background color to match your design.
   */
-
+  
   ::-moz-selection {
     background: #b3d4fc;
     text-shadow: none;
   }
-
+  
   ::selection {
     background: #b3d4fc;
     text-shadow: none;
   }
-
+  
   /*
   * A better looking default horizontal rule
   */
-
+  
   hr {
     display: block;
     height: 1px;
@@ -54,7 +54,7 @@
   /*
   * Remove the gap between images and the bottom of their containers: h5bp.com/i/440
   */
-
+  
   img {
     vertical-align: middle;
   }
@@ -77,7 +77,7 @@
   /*
   * Allow only vertical resizing of textareas.
   */
-
+  
   textarea {
     resize: vertical;
   }
@@ -87,7 +87,7 @@
   /* ==========================================================================
   Chrome Frame prompt
   ========================================================================== */
-
+  
   .chromeframe {
     margin: 0.2em 0;
     background: #ccc;
@@ -117,7 +117,7 @@
     content: "";
     display: block;
     width: 0;
-    height: 150%;
+    height: 100%;
   }
 
   /*
@@ -277,7 +277,7 @@
 // @param     $exclude {List} the list of features to exclude from the reset
 // @link    https://github.com/h5bp/html5-boilerplate/
 @mixin base-h5bp($exclude: ()) {
-/*! HTML5 Boilerplate | MIT License | @9ec546569b */
+/*! HTML5 Boilerplate | MIT License | @b378ce239d */
   /*
   * HTML5 Boilerplate
   *

data/stylesheets/archetype/base/_normalize.scss

@@ -1,4 +1,4 @@
-// normalize.css v2.1.2 | MIT License | git.io/normalize
+// normalize.css v2.0.1 | MIT License | git.io/normalize
 
 // @category  base
 @mixin base-normalize-html5() {
@@ -6,9 +6,9 @@
   HTML5 display definitions
   ========================================================================== */
 
-  /**
-   * Corrects `block` display not defined in IE 8/9.
-   */
+  /*
+  * Corrects `block` display not defined in IE 8/9.
+  */
 
   article,
   aside,
@@ -18,16 +18,15 @@
   footer,
   header,
   hgroup,
-  main,
   nav,
   section,
   summary {
       display: block;
   }
 
-  /**
-   * Corrects `inline-block` display not defined in IE 8/9.
-   */
+  /*
+  * Corrects `inline-block` display not defined in IE 8/9.
+  */
 
   audio,
   canvas,
@@ -35,43 +34,41 @@
       @include inline-block();
   }
 
-  /**
-   * Prevents modern browsers from displaying `audio` without controls.
-   * Remove excess height in iOS 5 devices.
-   */
+  /*
+  * Prevents modern browsers from displaying `audio` without controls.
+  * Remove excess height in iOS 5 devices.
+  */
 
   audio:not([controls]) {
       display: none;
       height: 0;
   }
 
-  /**
-   * Addresses styling for `hidden` attribute not present in IE 8/9.
-   * Hide the `template` element in IE, Safari, and Firefox < 22.
-   */
+  /*
+  * Addresses styling for `hidden` attribute not present in IE 8/9.
+  */
 
-  [hidden],
-  template {
+  [hidden] {
       display: none;
   }
 }
 
 @mixin base-normalize-text-adjust() {
-  /**
-   * 0. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
-   * http://clagnut.com/blog/348/#c790
-   * 1. Sets default font family to sans-serif.
-   * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
-   * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
-   */
+  /*
+  * 0. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
+  * http://clagnut.com/blog/348/#c790
+  * 1. Sets default font family to sans-serif.
+  * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
+  * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
+  */
   html {
     // legacy
     @if $legacy-support-for-ie7 or $legacy-support-for-ie6 {
       font-size: 100%; /* 0 */
     }
     font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
     -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
   }
 
 }
@@ -81,9 +78,9 @@
      Base
      ========================================================================== */
 
-  /**
-   * Removes default margin.
-   */
+  /*
+  * Removes default margin.
+  */
 
   body {
       margin: 0;
@@ -95,29 +92,17 @@
   Links
   ========================================================================== */
 
-  // TODO: need to evaluate this change given the issue known issue with
-  //  transparent background elements not gaining :focus state
-  //  so disabling this change for now :(
-  //  @see transparent-focusable
-  ///**
-  // * Remove the gray background color from active links in IE 10.
-  // */
-  //
-  //a {
-  //    background: transparent;
-  //}
-
-  /**
-   * Addresses `outline` inconsistency between Chrome and other browsers.
-   */
+  /*
+  * Addresses `outline` inconsistency between Chrome and other browsers.
+  */
 
   a:focus {
       outline: thin dotted;
   }
 
-  /**
-   * Improves readability when focused and also mouse hovered in all browsers.
-   */
+  /*
+  * Improves readability when focused and also mouse hovered in all browsers.
+  */
 
   a:active,
   a:hover {
@@ -126,9 +111,9 @@
 }
 
 @mixin base-normalize-typogrpahy-core() {
-  /**
-   * Corrects font family set oddly in Safari 5 and Chrome.
-   */
+  /*
+  * Corrects font family set oddly in Safari 5 and Chrome.
+  */
 
   code,
   kbd,
@@ -138,9 +123,9 @@
       font-size: 1em;
   }
 
-  /**
-   * Improves readability of pre-formatted text in all browsers.
-   */
+  /*
+  * Improves readability of pre-formatted text in all browsers.
+  */
 
   pre {
       white-space: pre;
@@ -149,17 +134,17 @@
   }
 
 
-  /**
-   * Addresses inconsistent and variable font size in all browsers.
-   */
+  /*
+  * Addresses inconsistent and variable font size in all browsers.
+  */
 
   small {
       font-size: 80%;
   }
 
-  /**
-   * Prevents `sub` and `sup` affecting `line-height` in all browsers.
-   */
+  /*
+  * Prevents `sub` and `sup` affecting `line-height` in all browsers.
+  */
 
   sub,
   sup {
@@ -183,10 +168,10 @@
   Typography
   ========================================================================== */
 
-  /**
-   * Addresses font sizes and margins set differently in IE6/7
-   * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
-   */
+  /*
+  * Addresses font sizes and margins set differently in IE6/7
+  * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
+  */
 
   h1 {
     font-size: 2em;
@@ -218,45 +203,33 @@
     margin: 2.33em 0;
   }
 
-  /**
-   * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
-   */
+  /*
+  * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
+  */
 
   abbr[title] {
       border-bottom: 1px dotted;
   }
 
-  /**
-   * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
-   */
+  /*
+  * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+  */
 
   b,
   strong {
       font-weight: bold;
   }
-
-  /**
-   * Addresses styling not present in Safari 5 and Chrome.
-   */
+  /*
+  * Addresses styling not present in Safari 5 and Chrome.
+  */
 
   dfn {
       font-style: italic;
   }
 
-  /**
-   * Address differences between Firefox and other browsers.
-   */
-
-  hr {
-      -moz-box-sizing: content-box;
-      box-sizing: content-box;
-      height: 0;
-  }
-
-
-  /**
-   * Addresses styling not present in IE 8/9.
-   */
+  /*
+  * Addresses styling not present in IE 8/9.
+  */
 
   mark {
       background: #ff0;
@@ -267,9 +240,9 @@
     margin: 1em 40px;
   }
 
-  /**
-   * Addresses margins set differently in IE6/7
-   */
+  /*
+  * Addresses margins set differently in IE6/7
+  */
 
   p,
   pre {
@@ -278,9 +251,9 @@
 }
 
 @mixin base-normalize-quotes() {
-  /**
-   * Sets consistent quote types.
-   */
+  /*
+  * Sets consistent quote types.
+  */
   q {
       quotes: "\201C" "\201D" "\2018" "\2019";
   }
@@ -293,7 +266,7 @@
     Lists
     ========================================================================== */
 
-    /**
+    /*
     * Addresses margins set differently in IE6/7
     */
 
@@ -308,7 +281,7 @@
       margin: 0 0 0 40px;
     }
 
-    /**
+    /*
     * Addresses paddings set differently in IE6/7
     */
 
@@ -318,7 +291,7 @@
       padding: 0 0 0 40px;
     }
 
-    /**
+    /*
     * Corrects list images handled incorrectly in IE7
     */
 
@@ -331,11 +304,11 @@
 }
 
 @mixin base-normalize-image() {
-  /**
-   * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
-   * 2. Improves image quality when scaled in IE7
-   * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
-   */
+  /*
+  * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
+  * 2. Improves image quality when scaled in IE7
+  * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
+  */
 
   img {
     border: 0; /* 1 */
@@ -351,10 +324,10 @@
   Embedded content
   ========================================================================== */
   @include base-normalize-image();
-
-  /**
-   * Corrects overflow displayed oddly in IE9
-   */
+  
+  /*
+  * Corrects overflow displayed oddly in IE9
+  */
 
   svg:not(:root) {
     overflow: hidden;
@@ -366,9 +339,9 @@
   Figures
   ========================================================================== */
 
-  /**
-   * Addresses margin not present in IE6/7/8/9, S5, O11
-   */
+  /*
+  * Addresses margin not present in IE6/7/8/9, S5, O11
+  */
 
   figure {
       margin: 0;
@@ -376,9 +349,9 @@
 }
 
 @mixin base-normalize-fieldset() {
-  /**
-   * Define consistent border, margin, and padding.
-   */
+  /*
+  * Define consistent border, margin, and padding.
+  */
 
   fieldset {
       border: 1px solid #c0c0c0;
@@ -392,19 +365,19 @@
   Forms
   ========================================================================== */
 
-  /**
-   * Corrects margin displayed oddly in IE6/7
-   */
+  /*
+  * Corrects margin displayed oddly in IE6/7
+  */
 
   form {
       margin: 0;
   }
 
-  /**
-   * 1. Corrects color not being inherited in IE6/7/8/9
-   * 2. Corrects text not wrapping in FF3
-   * 3. Corrects alignment displayed oddly in IE6/7
-   */
+  /*
+  * 1. Corrects color not being inherited in IE6/7/8/9
+  * 2. Corrects text not wrapping in FF3
+  * 3. Corrects alignment displayed oddly in IE6/7
+  */
 
   legend {
     border: 0; /* 1 */
@@ -416,12 +389,12 @@
     }
   }
 
-  /**
-   * 1. Corrects font family not being inherited in all browsers.
-   * 2. Corrects font size not being inherited in all browsers.
-   * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
-   * 4. Improves appearance and consistency in all browsers
-   */
+  /*
+  * 1. Corrects font family not being inherited in all browsers.
+  * 2. Corrects font size not being inherited in all browsers.
+  * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
+  * 4. Improves appearance and consistency in all browsers
+  */
 
   button,
   input,
@@ -437,35 +410,23 @@
       }
   }
 
-  /**
-   * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
-   */
+  /*
+  * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
+  */
 
   button,
   input {
       line-height: normal; /* 1 */
   }
 
-  /**
-   * Address inconsistent `text-transform` inheritance for `button` and `select`.
-   * All other form control elements do not inherit `text-transform` values.
-   * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
-   * Correct `select` style inheritance in Firefox 4+ and Opera.
-   */
-
-  button,
-  select {
-      text-transform: none;
-  }
-
-  /**
-   * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
-   * and `video` controls.
-   * 2. Correct inability to style clickable `input` types in iOS.
-   * 3. Improve usability and consistency of cursor style between image-type
-   * `input` and others.
-   * 4. Removes inner spacing in IE7 without affecting normal text inputs
-   */
+  /*
+  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+  * and `video` controls.
+  * 2. Corrects inability to style clickable `input` types in iOS.
+  * 3. Improves usability and consistency of cursor style between image-type
+  * `input` and others.
+  * 4. Removes inner spacing in IE7 without affecting normal text inputs
+  */
 
   button,
   html input[type="button"], /* 1 */
@@ -479,21 +440,21 @@
       }
   }
 
-  /**
-   * Re-set default cursor for disabled elements.
-   */
+  /*
+  * Re-set default cursor for disabled elements.
+  */
 
   button[disabled],
-  html input[disabled] {
+  input[disabled] {
       cursor: default;
   }
 
-  /**
-   * 1. Addresses box sizing set to `content-box` in IE 8/9.
-   * 2. Removes excess padding in IE 8/9.
-   * 3. Removes excess padding in IE7
+  /*
+  * 1. Addresses box sizing set to `content-box` in IE 8/9.
+  * 2. Removes excess padding in IE 8/9.
+  * 3. Removes excess padding in IE7
   Known issue: excess padding remains in IE6
-   */
+  */
 
   input[type="checkbox"],
   input[type="radio"] {
@@ -506,11 +467,11 @@
       }
   }
 
-  /**
-   * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
-   * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
-   * (include `-moz` to future-proof).
-   */
+  /*
+  * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
+  * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
+  * (include `-moz` to future-proof).
+  */
 
   input[type="search"] {
       -webkit-appearance: textfield; /* 1 */
@@ -520,10 +481,10 @@
   }
 
 
-  /**
-   * Removes inner padding and search cancel button in Safari 5 and Chrome
-   * on OS X.
-   */
+  /*
+  * Removes inner padding and search cancel button in Safari 5 and Chrome
+  * on OS X.
+  */
 
   input[type="search"]::-webkit-search-cancel-button,
   input[type="search"]::-webkit-search-decoration {
@@ -531,9 +492,9 @@
   }
 
 
-  /**
-   * Removes inner padding and border in Firefox 4+.
-   */
+  /*
+  * Removes inner padding and border in Firefox 4+.
+  */
 
   button::-moz-focus-inner,
   input::-moz-focus-inner {
@@ -541,16 +502,16 @@
       padding: 0;
   }
 
-  /**
-   * 1. Removes default vertical scrollbar in IE6/7/8/9
-   * 2. Improves readability and alignment in all browsers
-   */
+  /*
+  * 1. Removes default vertical scrollbar in IE6/7/8/9
+  * 2. Improves readability and alignment in all browsers
+  */
 
   textarea {
       overflow: auto; /* 1 */
       vertical-align: top; /* 2 */
   }
-
+  
 }
 
 @mixin base-normalize-ime() {
@@ -568,9 +529,9 @@
   Tables
   ========================================================================== */
 
-  /**
-   * Remove most spacing between table cells.
-   */
+  /*
+  * Remove most spacing between table cells.
+  */
 
   table {
       border-collapse: collapse;
@@ -584,7 +545,7 @@
 // @param     $exclude {List} the list of features to exclude from the reset
 // @link      http://github.com/necolas/normalize.css
 @mixin base-normalize($exclude: ()) {
-/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
   $exclude: -compass-list($exclude);
   @if(not index($exclude, normalize-html5)) {
     @include base-normalize-html5();