Skip to content

B
bootstrap
Commit 22fa3712 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
parents 1209a375 782c9940
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 176 deletions
bootstrap.css
View file @ 22fa3712
......@@ -6,95 +6,8 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 22 20:50:28 PST 2012
* Date: Mon Jan 23 11:25:06 PST 2012
*/
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: "";
}
html {
overflow-y: scroll;
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
a:focus {
outline: thin dotted;
}
a:hover, a:active {
outline: 0;
}
article,
aside,
details,
......@@ -115,6 +28,17 @@ audio, canvas, video {
audio:not([controls]) {
display: none;
}
html {
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
a:focus {
outline: thin dotted;
}
a:hover, a:active {
outline: 0;
}
sub, sup {
position: relative;
font-size: 75%;
......@@ -228,8 +152,6 @@ body {
width: 100%;
}
a {
font-weight: inherit;
line-height: inherit;
color: #0088cc;
text-decoration: none;
}
......@@ -324,7 +246,7 @@ a:hover {
margin-left: 900px;
}
p {
margin-bottom: 9px;
margin: 0 0 9px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18px;
......@@ -339,6 +261,7 @@ h3,
h4,
h5,
h6 {
margin: 0;
font-weight: bold;
color: #333333;
text-rendering: optimizelegibility;
......@@ -349,6 +272,7 @@ h3 small,
h4 small,
h5 small,
h6 small {
font-weight: normal;
color: #999999;
}
h1 {
......@@ -390,6 +314,7 @@ h6 {
text-transform: uppercase;
}
ul, ol {
padding: 0;
margin: 0 0 9px 25px;
}
ul ul,
......@@ -430,13 +355,10 @@ hr {
border-bottom: 1px solid #ffffff;
}
strong {
font-style: inherit;
font-weight: bold;
}
em {
font-style: italic;
font-weight: inherit;
line-height: inherit;
}
.muted {
color: #999999;
......@@ -448,8 +370,8 @@ abbr {
cursor: help;
}
blockquote {
padding-left: 15px;
margin-bottom: 18px;
padding: 0 0 0 15px;
margin: 0 0 18px;
border-left: 5px solid #eeeeee;
}
blockquote p {
......@@ -476,10 +398,17 @@ blockquote.pull-right {
blockquote.pull-right p, blockquote.pull-right small {
text-align: right;
}
q:before,
q:after,
blockquote:before,
blockquote:after {
content: "";
}
address {
display: block;
margin-bottom: 18px;
line-height: 18px;
font-style: normal;
}
code, pre {
padding: 0 3px 2px;
......@@ -517,21 +446,35 @@ pre code {
padding: 0;
background-color: transparent;
}
small {
font-size: 100%;
}
cite {
font-style: normal;
}
form {
margin-bottom: 18px;
margin: 0 0 18px;
}
fieldset {
padding: 0;
margin: 0;
border: 0;
}
legend {
display: block;
width: 100%;
padding: 0;
margin-bottom: 27px;
font-size: 19.5px;
line-height: 36px;
color: #333333;
border: 0;
border-bottom: 1px solid #eee;
-webkit-margin-collapse: separate;
}
label,
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
......@@ -969,6 +912,11 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
.form-horizontal .form-actions {
padding-left: 160px;
}
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
.table {
width: 100%;
margin-bottom: 18px;
......@@ -1897,7 +1845,7 @@ i {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query::-webkit-input-placeholder {
.navbar-search .search-query ::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
......
bootstrap.min.css
View file @ 22fa3712
This diff is collapsed.
lib/forms.less
View file @ 22fa3712
......@@ -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);
......
lib/reset.less
View file @ 22fa3712
// 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,
......
lib/scaffolding.less
View file @ 22fa3712
......@@ -60,8 +60,6 @@ body {
// Links
a {
font-weight: inherit;
line-height: inherit;
color: @linkColor;
text-decoration: none;
&:hover {
......
lib/tables.less
View file @ 22fa3712
......@@ -4,6 +4,15 @@
// ----------------------------------------
// BASE TABLES
// -----------------
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
// BASELINE STYLES
// ---------------
......
lib/type.less
View file @ 22fa3712
......@@ -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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment