Merge remote-tracking branch 'origin/master' into gh-pages

designmodo · Apr 8, 2014 · ee6149e · ee6149e
2 parents d6430cc + 73e71c2
commit ee6149e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -18,28 +18,28 @@ You are allowed to use these elements anywhere you want, however we’ll highly
   * Bootstrap upgraded to stable 3.1.0;
   * Respond.js upgraded to v1.4.2;
   * Optimized file indentations, 2 spaces are now used instead of tabs, ```.editorconfig``` file is added;
-  * Added variables font-path, font-name and font-id(https://github.com/twbs/bootstrap/issues/12164) for local fonts and glyphicons;
+  * Added variables font-path, font-name and font-id (https://github.com/twbs/bootstrap/issues/12164) for local fonts and glyphicons;
   * Added the ability to change the navbar height through the variables ```@navbar-height-base``` and ```@navbar-height-large```;
-  * Add ```@grid-float-breakpoint-max``` to better link navbar behavior across viewports and improve customization when setting ```@grid-float-breakpoint```(https://github.com/twbs/bootstrap/issues/11610);
-  * Add ```.small``` support to blockquote citations(https://github.com/twbs/bootstrap/pull/11414);
-  * Reorder the headings with body text and text emphasis classes(https://github.com/twbs/bootstrap/issues/11515);
-  * Remove color from outline reset for improved outlines on focus(https://github.com/twbs/bootstrap/pull/11551);
-  * Remove unnecessary prefixes for gradient mixins given our stated browser support(https://github.com/twbs/bootstrap/pull/11694);
-  * Add line-height to progress bar for proper text alignment within(https://github.com/twbs/bootstrap/issues/10407);
+  * Add ```@grid-float-breakpoint-max``` to better link navbar behavior across viewports and improve customization when setting ```@grid-float-breakpoint``` (https://github.com/twbs/bootstrap/issues/11610);
+  * Add ```.small``` support to blockquote citations (https://github.com/twbs/bootstrap/pull/11414);
+  * Reorder the headings with body text and text emphasis classes (https://github.com/twbs/bootstrap/issues/11515);
+  * Remove color from outline reset for improved outlines on focus (https://github.com/twbs/bootstrap/pull/11551);
+  * Remove unnecessary prefixes for gradient mixins given our stated browser support (https://github.com/twbs/bootstrap/pull/11694);
+  * Add line-height to progress bar for proper text alignment within (https://github.com/twbs/bootstrap/issues/10407);
   * Use ```@screen-xx-xx``` variables instead of hardcoded pixel values in modules;
-  * Enable use of form validation class on ```.radio```, ```.checkbox```, ```.radio-inline```, and ```.checkbox-inline```(https://github.com/twbs/bootstrap/issues/10522);
-  * Add ```<kbd>``` element styles to indicate user input via keyboard(https://github.com/twbs/bootstrap/issues/11193);
+  * Enable use of form validation class on ```.radio```, ```.checkbox```, ```.radio-inline```, and ```.checkbox-inline``` (https://github.com/twbs/bootstrap/issues/10522);
+  * Add ```<kbd>``` element styles to indicate user input via keyboard (https://github.com/twbs/bootstrap/issues/11193);
   * Add ```.animation()``` mixins(https://github.com/twbs/bootstrap/issues/11244);
-  * Prevent the double borders between multiple buttons in an input group(https://github.com/twbs/bootstrap/issues/11435);
-  * Updated ```.scale()``` mixin so that it accepts optional vertical scale as second parameter(https://github.com/twbs/bootstrap/issues/11748);
-  * Don't set ```@headings-font-family``` to the same font stack as the ```<body>```; instead, just use inherit for same default CSS(https://github.com/twbs/bootstrap/issues/11741);
-  * Add ```.make-xs-column``` mixins to complement the recently added extra small predefined grid classes(https://github.com/twbs/bootstrap/issues/11829);
-  * Add and use ```.text-emphasis-variant()``` mixin for emphasis classes(https://github.com/twbs/bootstrap/issues/12247);
-  * Add and use ```.bg-variant()``` mixin to generate background classes(https://github.com/twbs/bootstrap/issues/12248);
-  * Reset height on ```select[multiple]``` in ```.input-size()``` mixin(https://github.com/twbs/bootstrap/issues/12422);
-  * Account for badges within buttons by matching background to text color and text color to background(https://github.com/twbs/bootstrap/issues/11268);
-  * Drop the abbr element from the ```.initialism``` selector(https://github.com/twbs/bootstrap/issues/11277);
-  * Add ```.small``` support to blockquote citations(https://github.com/twbs/bootstrap/issues/11414);
+  * Prevent the double borders between multiple buttons in an input group (https://github.com/twbs/bootstrap/issues/11435);
+  * Updated ```.scale()``` mixin so that it accepts optional vertical scale as second parameter (https://github.com/twbs/bootstrap/issues/11748);
+  * Don't set ```@headings-font-family``` to the same font stack as the ```<body>```; instead, just use inherit for same default CSS (https://github.com/twbs/bootstrap/issues/11741);
+  * Add ```.make-xs-column``` mixins to complement the recently added extra small predefined grid classes (https://github.com/twbs/bootstrap/issues/11829);
+  * Add and use ```.text-emphasis-variant()``` mixin for emphasis classes (https://github.com/twbs/bootstrap/issues/12247);
+  * Add and use ```.bg-variant()``` mixin to generate background classes (https://github.com/twbs/bootstrap/issues/12248);
+  * Reset height on ```select[multiple]``` in ```.input-size()``` mixin (https://github.com/twbs/bootstrap/issues/12422);
+  * Account for badges within buttons by matching background to text color and text color to background (https://github.com/twbs/bootstrap/issues/11268);
+  * Drop the abbr element from the ```.initialism``` selector (https://github.com/twbs/bootstrap/issues/11277);
+  * Add ```.small``` support to blockquote citations (https://github.com/twbs/bootstrap/issues/11414);
   * Various small bugfixes and improvements.
 
 + 2.1.2 

diff --git a/css/flat-ui.css b/css/flat-ui.css
@@ -985,9 +985,9 @@ fieldset[disabled] .btn-link:focus {
   border-bottom-style: none;
   -webkit-transition: 0.25s;
   transition: 0.25s;
-  -webkit-transform: scale(1.001, );
-  -ms-transform: scale(1.001, );
-  transform: scale(1.001, );
+  -webkit-transform: scale(1.001);
+  -ms-transform: scale(1.001);
+  transform: scale(1.001);
 }
 .dropup .caret,
 .dropup .btn-lg .caret,

diff --git a/index.html b/index.html
@@ -663,7 +663,7 @@ <h4>Welcome to <small>Mail App</small></h4>
               <label class="login-field-icon fui-lock" for="login-pass"></label>
             </div>
 
-            <a class="btn btn-primary btn-lg btn-block" href="#">Login</a>
+            <a class="btn btn-primary btn-lg btn-block" href="#">Log in</a>
             <a class="login-link" href="#">Lost your password?</a>
           </div>
         </div>