+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
diff --git a/docs/less.html b/docs/less.html
index 84f58f00d7..5c8eb735dc 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,6 +34,7 @@
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 7fdbea0ec3..904d53af67 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,6 +34,7 @@
+<<<<<<< HEAD
@@ -115,6 +134,19 @@
Scaffolding
Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.
+=======
+
+
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
diff --git a/lib/buttons.less b/lib/buttons.less
index 5da34a5257..f13a9acbfd 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -102,7 +102,6 @@
}
}
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .alert-message,
:root .btn {
border-radius: 0 \0;
}
diff --git a/lib/forms.less b/lib/forms.less
index bdc6e3e078..be53c60cbc 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);
@@ -454,13 +463,17 @@ select:focus:required:invalid {
// Margin to space out fieldsets
.control-group {
- margin-bottom: @baseLineHeight;
+ margin-bottom: @baseLineHeight / 2;
}
// Horizontal-specific styles
// --------------------------
.form-horizontal {
+ // Increase spacing between groups
+ .control-group {
+ margin-bottom: @baseLineHeight;
+ }
// Float the labels left
.control-group > label {
float: left;
diff --git a/lib/reset.less b/lib/reset.less
index 8fe04d6d1e..31e7160f2d 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/responsive.less b/lib/responsive.less
index f5c23df3cd..416a8da7b7 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -97,11 +97,12 @@
// Modals
.modal {
- position: fixed;
+ position: absolute;
top: 20px;
left: 20px;
right: 20px;
width: auto;
+ margin: 0;
&.fade.in { top: auto; }
}
.modal-header .close {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 66e5cc32f3..ff029e841b 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 {
@@ -75,13 +73,10 @@ a {
// -----------
// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row {
+ margin-left: @gridGutterWidth * -1;
.clearfix();
}
-[class*="span"]:first-child{
- margin-left: 0;
-}
-
// Find all .span# classes within .row and give them the necessary properties for grid columns
// (supported by all browsers back to IE7)
// Credit to @dhg for the idea
diff --git a/lib/tables.less b/lib/tables.less
index 14e4ea44a3..4010f63ec8 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/thumbnails.less b/lib/thumbnails.less
index 4f9c5f76d3..0ba749059d 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -8,7 +8,7 @@
}
.thumbnails > li {
float: left;
- margin: 0 0 20px 20px;
+ margin: 0 0 @baseLineHeight 20px;
}
.thumbnail {
display: block;
diff --git a/lib/type.less b/lib/type.less
index a94a4956ed..2c6e7db6a2 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;
+}