From dad9889aeb703f7276a1c9e54e19df622ffadb99 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 1 Feb 2013 21:49:19 -0800
Subject: [PATCH] Fixes #6657: Upgrade Normalize to 2.1.0

---
 docs/assets/css/bootstrap.css | 15 ++++++++++++--
 less/normalize.less           | 38 +++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d67148b13c..d006d71606 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -18,6 +18,7 @@ figure,
 footer,
 header,
 hgroup,
+main,
 nav,
 section,
 summary {
@@ -59,6 +60,7 @@ a:hover {
 }
 
 h1 {
+  margin: 0.67em 0;
   font-size: 2em;
 }
 
@@ -75,6 +77,12 @@ dfn {
   font-style: italic;
 }
 
+hr {
+  height: 0;
+  -moz-box-sizing: content-box;
+       box-sizing: content-box;
+}
+
 mark {
   color: #000;
   background: #ff0;
@@ -89,8 +97,6 @@ samp {
 }
 
 pre {
-  word-wrap: break-word;
-  white-space: pre;
   white-space: pre-wrap;
 }
 
@@ -155,6 +161,11 @@ input {
   line-height: normal;
 }
 
+button,
+select {
+  text-transform: none;
+}
+
 button,
 html input[type="button"],
 input[type="reset"],
diff --git a/less/normalize.less b/less/normalize.less
index 8d5b8019b1..a2e9c6485f 100644
--- a/less/normalize.less
+++ b/less/normalize.less
@@ -1,4 +1,4 @@
-/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
 
 // ==========================================================================
 // HTML5 display definitions
@@ -16,6 +16,7 @@ figure,
 footer,
 header,
 hgroup,
+main,
 nav,
 section,
 summary {
@@ -100,12 +101,13 @@ a:hover {
 // ==========================================================================
 
 //
-// Address variable `h1` font size within `section` and `article` contexts in
-// Firefox 4+, Safari 5, and Chrome.
+// Address variable `h1` font-size and margin within `section` and `article`
+// contexts in Firefox 4+, Safari 5, and Chrome.
 //
 
 h1 {
   font-size: 2em;
+  margin: 0.67em 0;
 }
 
 //
@@ -130,7 +132,17 @@ strong {
 //
 
 dfn {
-    font-style: italic;
+  font-style: italic;
+}
+
+//
+// Address differences between Firefox and other browsers.
+//
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
 
 //
@@ -159,9 +171,7 @@ samp {
 //
 
 pre {
-  white-space: pre;
   white-space: pre-wrap;
-  word-wrap: break-word;
 }
 
 //
@@ -217,7 +227,7 @@ img {
 //
 
 svg:not(:root) {
-    overflow: hidden;
+  overflow: hidden;
 }
 
 // ==========================================================================
@@ -229,7 +239,7 @@ svg:not(:root) {
 //
 
 figure {
-    margin: 0;
+  margin: 0;
 }
 
 // ==========================================================================
@@ -281,6 +291,18 @@ input {
   line-height: normal;
 }
 
+//
+// 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.
-- 
GitLab