archetype 0.0.1.pre.3.f9dde24 → 0.0.1.pre.3.90263a7

data/lib/archetype/sass_extensions/monkey_patches.rb

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

data/lib/archetype/sass_extensions/monkey_patches/handle_include_loop.rb

@@ -0,0 +1,41 @@
+# :stopdoc:
+# monkey patch Sass to exclude special mixins from it's include loop logic
+module Sass
+  module Tree
+    module Visitors
+      class Perform
+        def handle_include_loop!(node)
+          # a list of exempt mixins
+          exempt = %w(to-styles output-style -outputStyle)
+          exempts = []
+
+          msg = "An @include loop has been found:"
+          content_count = 0
+          mixins = @stack.reverse.map {|s| s[:name]}.compact.select do |s|
+            if s == '@content'
+              content_count += 1
+              false
+            elsif content_count > 0
+              content_count -= 1
+              false
+            # if the mixin is exempt, keep track of it
+            elsif exempt.include?(s.gsub(/_/,'-'))
+              exempts.push(s)
+              false
+            else
+              true
+            end
+          end
+
+          return if mixins.empty? or (mixins.size <= exempts.size)
+          raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
+
+          msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|
+            "    #{m1} includes #{m2}"
+          end.join("\n")
+          raise Sass::SyntaxError.new(msg)
+        end
+      end
+    end
+  end
+end

data/stylesheets/archetype/_base.scss

@@ -38,6 +38,9 @@ $RESET_INIT: false !default;
   // the font-face mixin will likely change in a future version, keep an eye on this
   // https://github.com/chriseppstein/compass/issues/867
   @include font-face($CONFIG_GLYPHS_NAME, $CONFIG_GLYPHS_FILES, $CONFIG_GLYPHS_EOT, $CONFIG_GLYPHS_WEIGHT, $CONFIG_GLYPHS_STYLE);
+  // output a second @font-face set with a versioned family name
+  // this will help avoid collisions when multi-app CSS is loaded on a single page
+  @include font-face('#{$CONFIG_GLYPHS_NAME}-#{$CONFIG_GLYPHS_VERSION}', $CONFIG_GLYPHS_FILES, $CONFIG_GLYPHS_EOT, $CONFIG_GLYPHS_WEIGHT, $CONFIG_GLYPHS_STYLE);
 }
 
 // auto invoke base reset

data/stylesheets/archetype/_config.scss

@@ -59,6 +59,7 @@ $CONFIG_KEYFRAME_LOADERS:         archetype-loader !default;
 
 // glyphs
 $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 glpyh fonts (sans extensions)
 $CONFIG_GLYPHS_EOT:               '#{$CONFIG_GLYPHS_BASE_PATH}.eot' !default;
@@ -367,4 +368,7 @@ $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;
+$archetype-pseudo-selector: false !default;
+
+$CORE_GLYPH_SELECTOR_VAR: '$archetype-glyph-selector';
+$CORE_GLYPH_SELECTOR_VAR: '$archetype-pseudo-selector';

data/stylesheets/archetype/_hacks.scss

@@ -38,8 +38,16 @@
 // @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($styles: false, $content: false, $name: '') {
-  @include ie-pseudo($styles, $content, before, $name);
+  @if archetype-version('Sass >= 3.2') {
+    @include ie-pseudo($styles, $content, before, $name) {
+      @content;
+    }
+  }
+  @else {
+    @include ie-pseudo($styles, $content, before, $name);
+  }
 }
 
 // proxy for ie-pseudo
@@ -47,11 +55,19 @@
 // @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($styles: false, $content: false, $name: '') {
-  @include ie-pseudo($styles, $content, after, $name);
+  @if archetype-version('Sass >= 3.2') {
+    @include ie-pseudo($styles, $content, after, $name) {
+      @content;
+    }
+  }
+  @else {
+    @include ie-pseudo($styles, $content, after, $name);
+  }
 }
 
-// this creates a one-type executing expression that inserts an element relative to `this` element.
+// this creates a one-time 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
@@ -60,6 +76,7 @@
 // @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;
   @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
@@ -77,7 +94,10 @@
     @if not $CONFIG_GENERATED_TAG_INLINE {
       // output it on the generated selector
       #{$archetype-pseudo-selector} {
-        @include to-styles(-style-string-to-list($styles));
+        @include to-styles(-style-string-to-list(unquote($styles)));
+        @if archetype-version('Sass >= 3.2') {
+          @content;
+        }
       }
     }
   }

data/stylesheets/archetype/_ui.scss

@@ -117,6 +117,21 @@
   clip: rect(1px, 1px, 1px, 1px);
 }
 
+// reverse hide-element and make the element visibile again
+// @mixin     unhide-element
+// @see       hide-element
+// @param     $position {String} value for the position property
+// @param     $height {String} value for the height property
+// @param     $width {String} value for the width property
+// @param     $overflow {String} value for the overflow property
+@mixin unhide-element($position: static, $height:auto, $width:auto, $overflow:visible) {
+  position: $position;
+  height: $height;
+  width: $width;
+  overflow: $overflow;
+  clip: auto;
+}
+
 // mixin for generating a fade box which fades from transparent to white
 // @mixin     fade-box
 // @param     $width {String} the width of the overlay
@@ -155,6 +170,7 @@
 // @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;
   $char-mapping: nil;
@@ -180,7 +196,7 @@
     }
     $selector: if(index(before after, $placement), '&:#{$placement}', '&');
     #{$selector} {
-      font-family: '#{$CONFIG_GLYPHS_NAME}';
+      font-family: '#{$CONFIG_GLYPHS_NAME}-#{$CONFIG_GLYPHS_VERSION}', '#{$CONFIG_GLYPHS_NAME}';
       font-weight: $CONFIG_GLYPHS_WEIGHT;
       font-style: $CONFIG_GLYPHS_STYLE;
       text-decoration: inherit;
@@ -194,7 +210,7 @@
     $archetype-glyph-selector: $selector;
     @if($selector != '&' and $ie-styles != nil) {
       // support for IE6/7
-      $styles: "font-family:'#{$CONFIG_GLYPHS_NAME}';font-weight:#{$CONFIG_GLYPHS_WEIGHT};font-style:#{$CONFIG_GLYPHS_STYLE};text-decoration:inherit;";
+      $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;";
       @if($size != nil) {
         $styles: $styles + "font-size:#{$size};"
       }
@@ -209,6 +225,11 @@
         $archetype-glyph-selector: '#{$selector}, #{$archetype-pseudo-selector}';
       }
     }
+    @if archetype-version('Sass >= 3.2') {
+      #{$archetype-glyph-selector} {
+        @content;
+      }
+    }
   }
 }
 

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: 100%;
+    height: 150%;
   }
 
   /*
@@ -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 | @b378ce239d */
+/*! HTML5 Boilerplate | MIT License | @9ec546569b */
   /*
   * HTML5 Boilerplate
   *

data/stylesheets/archetype/base/_normalize.scss

@@ -1,4 +1,4 @@
-// normalize.css v2.0.1 | MIT License | git.io/normalize
+// normalize.css v2.1.2 | 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,15 +18,16 @@
   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,
@@ -34,41 +35,43 @@
       @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.
-  */
+  /**
+   * Addresses styling for `hidden` attribute not present in IE 8/9.
+   * Hide the `template` element in IE, Safari, and Firefox < 22.
+   */
 
-  [hidden] {
+  [hidden],
+  template {
       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 */
-    -webkit-text-size-adjust: 100%; /* 2 */
     -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
   }
 
 }
@@ -78,9 +81,9 @@
      Base
      ========================================================================== */
 
-  /*
-  * Removes default margin.
-  */
+  /**
+   * Removes default margin.
+   */
 
   body {
       margin: 0;
@@ -92,17 +95,29 @@
   Links
   ========================================================================== */
 
-  /*
-  * Addresses `outline` inconsistency between Chrome and other browsers.
-  */
+  // 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.
+   */
 
   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 {
@@ -111,9 +126,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,
@@ -123,9 +138,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;
@@ -134,17 +149,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 {
@@ -168,10 +183,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;
@@ -203,33 +218,45 @@
     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;
   }
 
-  /*
-  * Addresses styling not present in IE 8/9.
-  */
+  /**
+   * 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.
+   */
 
   mark {
       background: #ff0;
@@ -240,9 +267,9 @@
     margin: 1em 40px;
   }
 
-  /*
-  * Addresses margins set differently in IE6/7
-  */
+  /**
+   * Addresses margins set differently in IE6/7
+   */
 
   p,
   pre {
@@ -251,9 +278,9 @@
 }
 
 @mixin base-normalize-quotes() {
-  /*
-  * Sets consistent quote types.
-  */
+  /**
+   * Sets consistent quote types.
+   */
   q {
       quotes: "\201C" "\201D" "\2018" "\2019";
   }
@@ -266,7 +293,7 @@
     Lists
     ========================================================================== */
 
-    /*
+    /**
     * Addresses margins set differently in IE6/7
     */
 
@@ -281,7 +308,7 @@
       margin: 0 0 0 40px;
     }
 
-    /*
+    /**
     * Addresses paddings set differently in IE6/7
     */
 
@@ -291,7 +318,7 @@
       padding: 0 0 0 40px;
     }
 
-    /*
+    /**
     * Corrects list images handled incorrectly in IE7
     */
 
@@ -304,11 +331,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 */
@@ -324,10 +351,10 @@
   Embedded content
   ========================================================================== */
   @include base-normalize-image();
-  
-  /*
-  * Corrects overflow displayed oddly in IE9
-  */
+
+  /**
+   * Corrects overflow displayed oddly in IE9
+   */
 
   svg:not(:root) {
     overflow: hidden;
@@ -339,9 +366,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;
@@ -349,9 +376,9 @@
 }
 
 @mixin base-normalize-fieldset() {
-  /*
-  * Define consistent border, margin, and padding.
-  */
+  /**
+   * Define consistent border, margin, and padding.
+   */
 
   fieldset {
       border: 1px solid #c0c0c0;
@@ -365,19 +392,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 */
@@ -389,12 +416,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,
@@ -410,23 +437,35 @@
       }
   }
 
-  /*
-  * 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 */
   }
 
-  /*
-  * 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
-  */
+  /**
+   * 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
+   */
 
   button,
   html input[type="button"], /* 1 */
@@ -440,21 +479,21 @@
       }
   }
 
-  /*
-  * Re-set default cursor for disabled elements.
-  */
+  /**
+   * Re-set default cursor for disabled elements.
+   */
 
   button[disabled],
-  input[disabled] {
+  html 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"] {
@@ -467,11 +506,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 */
@@ -481,10 +520,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 {
@@ -492,9 +531,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 {
@@ -502,16 +541,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() {
@@ -529,9 +568,9 @@
   Tables
   ========================================================================== */
 
-  /*
-  * Remove most spacing between table cells.
-  */
+  /**
+   * Remove most spacing between table cells.
+   */
 
   table {
       border-collapse: collapse;
@@ -545,7 +584,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.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
   $exclude: -compass-list($exclude);
   @if(not index($exclude, normalize-html5)) {
     @include base-normalize-html5();