1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 11:00:56 +02:00

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

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
This commit is contained in:
Mark Otto
2012-01-23 11:25:16 -08:00
7 changed files with 132 additions and 176 deletions

144
bootstrap.css vendored
View File

@@ -6,95 +6,8 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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, article,
aside, aside,
details, details,
@@ -115,6 +28,17 @@ audio, canvas, video {
audio:not([controls]) { audio:not([controls]) {
display: none; 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 { sub, sup {
position: relative; position: relative;
font-size: 75%; font-size: 75%;
@@ -228,8 +152,6 @@ body {
width: 100%; width: 100%;
} }
a { a {
font-weight: inherit;
line-height: inherit;
color: #0088cc; color: #0088cc;
text-decoration: none; text-decoration: none;
} }
@@ -324,7 +246,7 @@ a:hover {
margin-left: 900px; margin-left: 900px;
} }
p { p {
margin-bottom: 9px; margin: 0 0 9px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
@@ -339,6 +261,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
margin: 0;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
@@ -349,6 +272,7 @@ h3 small,
h4 small, h4 small,
h5 small, h5 small,
h6 small { h6 small {
font-weight: normal;
color: #999999; color: #999999;
} }
h1 { h1 {
@@ -390,6 +314,7 @@ h6 {
text-transform: uppercase; text-transform: uppercase;
} }
ul, ol { ul, ol {
padding: 0;
margin: 0 0 9px 25px; margin: 0 0 9px 25px;
} }
ul ul, ul ul,
@@ -430,13 +355,10 @@ hr {
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
} }
strong { strong {
font-style: inherit;
font-weight: bold; font-weight: bold;
} }
em { em {
font-style: italic; font-style: italic;
font-weight: inherit;
line-height: inherit;
} }
.muted { .muted {
color: #999999; color: #999999;
@@ -448,8 +370,8 @@ abbr {
cursor: help; cursor: help;
} }
blockquote { blockquote {
padding-left: 15px; padding: 0 0 0 15px;
margin-bottom: 18px; margin: 0 0 18px;
border-left: 5px solid #eeeeee; border-left: 5px solid #eeeeee;
} }
blockquote p { blockquote p {
@@ -476,10 +398,17 @@ blockquote.pull-right {
blockquote.pull-right p, blockquote.pull-right small { blockquote.pull-right p, blockquote.pull-right small {
text-align: right; text-align: right;
} }
q:before,
q:after,
blockquote:before,
blockquote:after {
content: "";
}
address { address {
display: block; display: block;
margin-bottom: 18px; margin-bottom: 18px;
line-height: 18px; line-height: 18px;
font-style: normal;
} }
code, pre { code, pre {
padding: 0 3px 2px; padding: 0 3px 2px;
@@ -517,21 +446,35 @@ pre code {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
} }
small {
font-size: 100%;
}
cite {
font-style: normal;
}
form { form {
margin-bottom: 18px; margin: 0 0 18px;
}
fieldset {
padding: 0;
margin: 0;
border: 0;
} }
legend { legend {
display: block; display: block;
width: 100%; width: 100%;
padding: 0;
margin-bottom: 27px; margin-bottom: 27px;
font-size: 19.5px; font-size: 19.5px;
line-height: 36px; line-height: 36px;
color: #333333; color: #333333;
border: 0;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
-webkit-margin-collapse: separate; -webkit-margin-collapse: separate;
} }
label, label,
input, input,
button,
select, select,
textarea { textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 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 { .form-horizontal .form-actions {
padding-left: 160px; padding-left: 160px;
} }
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
.table { .table {
width: 100%; width: 100%;
margin-bottom: 18px; margin-bottom: 18px;
@@ -1897,7 +1845,7 @@ i {
.navbar-search .search-query :-moz-placeholder { .navbar-search .search-query :-moz-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query::-webkit-input-placeholder { .navbar-search .search-query ::-webkit-input-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query:hover { .navbar-search .search-query:hover {

42
bootstrap.min.css vendored
View File

@@ -1,14 +1,9 @@
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,figcaption,figure,footer,header,hgroup,nav,section{display:block;} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
audio:not([controls]){display:none;} 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%;line-height:0;vertical-align:baseline;} sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
sup{top:-0.5em;} sup{top:-0.5em;}
sub{bottom:-0.25em;} sub{bottom:-0.25em;}
@@ -31,7 +26,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.sidebar-left .fluid-sidebar{float:left;margin-left:-240px;} .sidebar-left .fluid-sidebar{float:left;margin-left:-240px;}
.sidebar-right .fluid-sidebar{float:right;margin-right:-240px;} .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
.fluid-content{float:left;width:100%;} .fluid-content{float:left;width:100%;}
a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;} a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
.row{*zoom:1;}.row:before,.row:after{display:table;content:"";} .row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;} .row:after{clear:both;}
[class*="span"]:first-child{margin-left:0;} [class*="span"]:first-child{margin-left:0;}
@@ -59,8 +54,8 @@ a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:
.offset9{margin-left:740px;} .offset9{margin-left:740px;}
.offset10{margin-left:820px;} .offset10{margin-left:820px;}
.offset11{margin-left:900px;} .offset11{margin-left:900px;}
p{margin-bottom:9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#999999;} h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
@@ -68,7 +63,7 @@ h4,h5,h6{line-height:18px;}
h4{font-size:14px;}h4 small{font-size:12px;} h4{font-size:14px;}h4 small{font-size:12px;}
h5{font-size:12px;} h5{font-size:12px;}
h6{font-size:11px;color:#999999;text-transform:uppercase;} h6{font-size:11px;color:#999999;text-transform:uppercase;}
ul,ol{margin:0 0 9px 25px;} ul,ol{padding:0;margin:0 0 9px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;} ul{list-style:disc;}
ol{list-style:decimal;} ol{list-style:decimal;}
@@ -79,21 +74,25 @@ dt,dd{line-height:18px;}
dt{font-weight:bold;} dt{font-weight:bold;}
dd{margin-left:9px;} dd{margin-left:9px;}
hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;} hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
strong{font-style:inherit;font-weight:bold;} strong{font-weight:bold;}
em{font-style:italic;font-weight:inherit;line-height:inherit;} em{font-style:italic;}
.muted{color:#999999;} .muted{color:#999999;}
abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
address{display:block;margin-bottom:18px;line-height:18px;} 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;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{padding:1px 3px;background-color:#fee9cc;} code{padding:1px 3px;background-color:#fee9cc;}
pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
pre code{padding:0;background-color:transparent;} pre code{padding:0;background-color:transparent;}
form{margin-bottom:18px;} small{font-size:100%;}
legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;} cite{font-style:normal;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} form{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;font-size:13px;font-weight:normal;line-height:18px;}
label{display:block;margin-bottom:5px;color:#333333;} label{display:block;margin-bottom:5px;color:#333333;}
input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
@@ -177,6 +176,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
.form-horizontal .controls{margin-left:160px;} .form-horizontal .controls{margin-left:160px;}
.form-horizontal .form-actions{padding-left:160px;} .form-horizontal .form-actions{padding-left:160px;}
table{max-width:100%;border-collapse:collapse;border-spacing:0;}
.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} .table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
.table th{font-weight:bold;vertical-align:bottom;} .table th{font-weight:bold;vertical-align:bottom;}
.table td{vertical-align:top;} .table td{vertical-align:top;}
@@ -376,7 +376,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.navbar .btn-group .btn{margin-top:0;} .navbar .btn-group .btn{margin-top:0;}
.navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} .navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);} .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
.navbar-static{margin-bottom:18px;} .navbar-static{margin-bottom:18px;}
@@ -539,4 +539,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.show{display:block;} .show{display:block;}
.invisible{visibility:hidden;} .invisible{visibility:hidden;}
.hidden{display:none;visibility:hidden;} .hidden{display:none;visibility:hidden;}
@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} @media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}

View File

@@ -8,17 +8,25 @@
// Make all forms have space below them // Make all forms have space below them
form { form {
margin-bottom: @baseLineHeight; margin: 0 0 @baseLineHeight;
}
fieldset {
padding: 0;
margin: 0;
border: 0;
} }
// Groups of fields with labels on top (legends) // Groups of fields with labels on top (legends)
legend { legend {
display: block; display: block;
width: 100%; width: 100%;
padding: 0;
margin-bottom: @baseLineHeight * 1.5; margin-bottom: @baseLineHeight * 1.5;
font-size: @baseFontSize * 1.5; font-size: @baseFontSize * 1.5;
line-height: @baseLineHeight * 2; line-height: @baseLineHeight * 2;
color: @grayDark; color: @grayDark;
border: 0;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
-webkit-margin-collapse: separate; -webkit-margin-collapse: separate;
} }
@@ -26,6 +34,7 @@ legend {
// Set font for forms // Set font for forms
label, label,
input, input,
button,
select, select,
textarea { textarea {
#font > .sans-serif(@baseFontSize,normal,@baseLineHeight); #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);

View File

@@ -1,50 +1,10 @@
// Reset.less // Reset.less
// Props to Eric Meyer (meyerweb.com) for his CSS reset file. // Adapted from Normalize.css http://github.com/necolas/normalize.css
// 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).
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// 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 // 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, article,
aside, aside,
details, details,
@@ -60,7 +20,7 @@ section {
// Display block in IE6-9 and FF3 // Display block in IE6-9 and FF3
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css
audio, audio,
canvas, canvas,
video { video {
@@ -71,14 +31,32 @@ video {
// Prevents modern browsers from displaying 'audio' without controls // Prevents modern browsers from displaying 'audio' without controls
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css
audio:not([controls]) { audio:not([controls]) {
display: none; 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 // Prevents sub and sup affecting line-height in all browsers
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css
sub, sub,
sup { sup {
position: relative; position: relative;
@@ -95,7 +73,7 @@ sub {
// Img border in a's and image quality // Img border in a's and image quality
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css
img { img {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
@@ -105,7 +83,6 @@ img {
// Forms // Forms
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css
// Font size in all browsers, margin changes, misc consistency // Font size in all browsers, margin changes, misc consistency
button, button,

View File

@@ -60,8 +60,6 @@ body {
// Links // Links
a { a {
font-weight: inherit;
line-height: inherit;
color: @linkColor; color: @linkColor;
text-decoration: none; text-decoration: none;
&:hover { &:hover {

View File

@@ -4,6 +4,15 @@
// ---------------------------------------- // ----------------------------------------
// BASE TABLES
// -----------------
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
// BASELINE STYLES // BASELINE STYLES
// --------------- // ---------------

View File

@@ -7,7 +7,7 @@
// --------- // ---------
p { p {
margin-bottom: @baseLineHeight / 2; margin: 0 0 @baseLineHeight / 2;
font-family: @baseFontFamily; font-family: @baseFontFamily;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
@@ -17,15 +17,16 @@ p {
} }
} }
// HEADINGS // HEADINGS
// -------- // --------
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin: 0;
font-weight: bold; font-weight: bold;
color: @grayDark; color: @grayDark;
text-rendering: optimizelegibility; // Fix the character spacing for headings text-rendering: optimizelegibility; // Fix the character spacing for headings
small { small {
font-weight: normal;
color: @grayLight; color: @grayLight;
} }
} }
@@ -74,6 +75,7 @@ h6 {
// Unordered and Ordered lists // Unordered and Ordered lists
ul, ol { ul, ol {
padding: 0;
margin: 0 0 @baseLineHeight / 2 25px; margin: 0 0 @baseLineHeight / 2 25px;
} }
ul ul, ul ul,
@@ -124,13 +126,10 @@ hr {
// Emphasis // Emphasis
strong { strong {
font-style: inherit;
font-weight: bold; font-weight: bold;
} }
em { em {
font-style: italic; font-style: italic;
font-weight: inherit;
line-height: inherit;
} }
.muted { .muted {
color: @grayLight; color: @grayLight;
@@ -146,8 +145,8 @@ abbr {
// Blockquotes // Blockquotes
blockquote { blockquote {
padding-left: 15px; padding: 0 0 0 15px;
margin-bottom: @baseLineHeight; margin: 0 0 @baseLineHeight;
border-left: 5px solid @grayLighter; border-left: 5px solid @grayLighter;
p { p {
margin-bottom: 0; margin-bottom: 0;
@@ -176,11 +175,19 @@ blockquote {
} }
} }
q:before,
q:after,
blockquote:before,
blockquote:after {
content: "";
}
// Addresses // Addresses
address { address {
display: block; display: block;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
line-height: @baseLineHeight; line-height: @baseLineHeight;
font-style: normal;
} }
// Inline and block code styles // Inline and block code styles
@@ -220,4 +227,12 @@ pre {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
} }
} }
small {
font-size: 100%;
}
cite {
font-style: normal;
}