Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less

5 files changed, 65 insertions, 57 deletions

diff --git a/lib/forms.less b/lib/forms.less
index bdc6e3e07..85bf26163 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -8,17 +8,25 @@
 
 // Make all forms have space below them
 form {
-  margin-bottom: @baseLineHeight;
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 
 // Groups of fields with labels on top (legends)
 legend {
   display: block;
   width: 100%;
+  padding: 0;
   margin-bottom: @baseLineHeight * 1.5;
   font-size: @baseFontSize * 1.5;
   line-height: @baseLineHeight * 2;
   color: @grayDark;
+  border: 0;
   border-bottom: 1px solid #eee;
   -webkit-margin-collapse: separate;
 }
@@ -26,6 +34,7 @@ legend {
 // Set font for forms
 label,
 input,
+button,
 select,
 textarea {
   #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
diff --git a/lib/reset.less b/lib/reset.less
index 8fe04d6d1..31e7160f2 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,50 +1,10 @@
 // Reset.less
-// Props to Eric Meyer (meyerweb.com) for his CSS reset file.
-// We're using an adapted version here that cuts out some of the reset HTML
-// elements we will never need here (i.e., dfn, samp, etc).
+// Adapted from Normalize.css http://github.com/necolas/normalize.css
 // ------------------------------------------------------------------------
 
-
-// ERIC MEYER RESET
-// --------------------------------------------------
-
-html, body { margin: 0; padding: 0; }
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul { list-style: none; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-
-// Normalize.css
-// Pulling in select resets form the normalize.css project
-// --------------------------------------------------
-
 // Display in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  outline: thin dotted;
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
 
-// Display in IE6-9 and FF3
-// -------------------------
-// Source: http://github.com/necolas/normalize.css
 article,
 aside,
 details,
@@ -60,7 +20,7 @@ section {
 
 // Display block in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio,
 canvas,
 video {
@@ -71,14 +31,32 @@ video {
 
 // Prevents modern browsers from displaying 'audio' without controls
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio:not([controls]) {
     display: none;
 }
 
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  outline: thin dotted;
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
 // Prevents sub and sup affecting line-height in all browsers
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 sub,
 sup {
   position: relative;
@@ -95,7 +73,7 @@ sub {
 
 // Img border in a's and image quality
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 img {
   max-width: 100%;
   height: auto;
@@ -105,7 +83,6 @@ img {
 
 // Forms
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
 
 // Font size in all browsers, margin changes, misc consistency
 button,
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 66e5cc32f..13f55026d 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -60,8 +60,6 @@ body {
 
 // Links
 a {
-  font-weight: inherit;
-  line-height: inherit;
   color: @linkColor;
   text-decoration: none;
   &:hover {
diff --git a/lib/tables.less b/lib/tables.less
index 14e4ea44a..4010f63ec 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -4,6 +4,15 @@
 // ----------------------------------------
 
 
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
 // BASELINE STYLES
 // ---------------
 
diff --git a/lib/type.less b/lib/type.less
index a94a4956e..2c6e7db6a 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -7,7 +7,7 @@
 // ---------
 
 p {
-  margin-bottom: @baseLineHeight / 2;
+  margin: 0 0 @baseLineHeight / 2;
   font-family: @baseFontFamily;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -17,15 +17,16 @@ p {
   }
 }
 
-
 // HEADINGS
 // --------
 
 h1, h2, h3, h4, h5, h6 {
+  margin: 0;
   font-weight: bold;
   color: @grayDark;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
+    font-weight: normal;
     color: @grayLight;
   }
 }
@@ -74,6 +75,7 @@ h6 {
 
 // Unordered and Ordered lists
 ul, ol {
+  padding: 0;
   margin: 0 0 @baseLineHeight / 2 25px;
 }
 ul ul,
@@ -124,13 +126,10 @@ hr {
 
 // Emphasis
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
   color: @grayLight;
@@ -146,8 +145,8 @@ abbr {
 
 // Blockquotes
 blockquote {
-  padding-left: 15px;
-  margin-bottom: @baseLineHeight;
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
   border-left: 5px solid @grayLighter;
   p {
     margin-bottom: 0;
@@ -176,11 +175,19 @@ blockquote {
   }
 }
 
+q:before,
+q:after,
+blockquote:before, 
+blockquote:after {
+  content: "";
+}
+
 // Addresses
 address {
   display: block;
   margin-bottom: @baseLineHeight;
   line-height: @baseLineHeight;
+  font-style: normal;
 }
 
 // Inline and block code styles
@@ -220,4 +227,12 @@ pre {
     padding: 0;
     background-color: transparent;
   }
-}
\ No newline at end of file
+}
+
+small {
+  font-size: 100%;
+}
+
+cite {
+  font-style: normal;
+}