Skip to content

B
bootstrap
Commit 74521e83 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 

Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
parents f764aee4 a0740870
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 381 additions and 243 deletions
bootstrap.css
View file @ 74521e83
...@@ -6,95 +6,12 @@ ...@@ -6,95 +6,12 @@
* 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.
<<<<<<< HEAD
* Date: Mon Jan 23 14:12:25 PST 2012 * Date: Mon Jan 23 14:12:25 PST 2012
=======
* Date: Mon Jan 23 13:48:03 PST 2012
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
*/ */
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 +32,17 @@ audio, canvas, video { ...@@ -115,6 +32,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 +156,6 @@ body { ...@@ -228,8 +156,6 @@ body {
width: 100%; width: 100%;
} }
a { a {
font-weight: inherit;
line-height: inherit;
color: #0088cc; color: #0088cc;
text-decoration: none; text-decoration: none;
} }
...@@ -238,6 +164,7 @@ a:hover { ...@@ -238,6 +164,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
.row { .row {
margin-left: -20px;
*zoom: 1; *zoom: 1;
} }
.row:before, .row:after { .row:before, .row:after {
...@@ -247,9 +174,6 @@ a:hover { ...@@ -247,9 +174,6 @@ a:hover {
.row:after { .row:after {
clear: both; clear: both;
} }
[class*="span"]:first-child {
margin-left: 0;
}
[class*="span"] { [class*="span"] {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
...@@ -324,7 +248,7 @@ a:hover { ...@@ -324,7 +248,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 +263,7 @@ h3, ...@@ -339,6 +263,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 +274,7 @@ h3 small, ...@@ -349,6 +274,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 +316,7 @@ h6 { ...@@ -390,6 +316,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 +357,10 @@ hr { ...@@ -430,13 +357,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 +372,8 @@ abbr { ...@@ -448,8 +372,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 +400,17 @@ blockquote.pull-right { ...@@ -476,10 +400,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 +448,35 @@ pre code { ...@@ -517,21 +448,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;
...@@ -955,6 +900,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ...@@ -955,6 +900,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
display: inline-block; display: inline-block;
} }
.control-group { .control-group {
margin-bottom: 9px;
}
.form-horizontal .control-group {
margin-bottom: 18px; margin-bottom: 18px;
} }
.form-horizontal .control-group > label { .form-horizontal .control-group > label {
...@@ -969,6 +917,11 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ...@@ -969,6 +917,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 +1850,7 @@ i { ...@@ -1897,7 +1850,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 {
...@@ -2725,7 +2678,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2725,7 +2678,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
} }
.thumbnails > li { .thumbnails > li {
float: left; float: left;
margin: 0 0 20px 20px; margin: 0 0 18px 20px;
} }
.thumbnail { .thumbnail {
display: block; display: block;
...@@ -3119,6 +3072,7 @@ a.thumbnail:hover { ...@@ -3119,6 +3072,7 @@ a.thumbnail:hover {
left: 20px; left: 20px;
right: 20px; right: 20px;
width: auto; width: auto;
margin: 0;
} }
.modal.fade.in { .modal.fade.in {
top: auto; top: auto;
......
bootstrap.min.css
View file @ 74521e83
This diff is collapsed.
docs/assets/css/docs.css
View file @ 74521e83
...@@ -115,8 +115,8 @@ section { ...@@ -115,8 +115,8 @@ section {
------------------------- */ ------------------------- */
/* supporting docs pages */ /* supporting docs pages */
.subhead { .subhead {
padding-bottom: 14px; padding-bottom: 0;
border-bottom: 3px solid #e5e5e5; border-bottom: 0;
} }
.subhead h1, .subhead h1,
.subhead p { .subhead p {
...@@ -126,6 +126,36 @@ section { ...@@ -126,6 +126,36 @@ section {
font-size: 45px; font-size: 45px;
} }
/* Subnav */
.subhead .nav {
padding: 0 10px;
background-color: #eeeeee; /* Old browsers */
background-repeat: repeat-x; /* Repeat the gradient */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
border: 1px solid #eee;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.subhead .nav a {
margin: 0;
padding-top: 11px;
padding-bottom: 11px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.subhead .nav .active a {
background-color: #fff;
color: #333;
}
/* Quick links /* Quick links
-------------------------------------------------- */ -------------------------------------------------- */
...@@ -418,6 +448,7 @@ h2 + .row { ...@@ -418,6 +448,7 @@ h2 + .row {
margin: -18px 0 27px; margin: -18px 0 27px;
font-size: 18px; font-size: 18px;
font-weight: 300; font-weight: 300;
line-height: 24px;
color: #999; color: #999;
text-align: center; text-align: center;
} }
...@@ -533,6 +564,18 @@ form.well { ...@@ -533,6 +564,18 @@ form.well {
margin: 0 auto 10px; margin: 0 auto 10px;
} }
/* Subnav */
.subhead .nav {
padding: 0;
background: none;
}
.subhead .nav > li {
float: none;
}
.subhead .nav li + li a {
border-top: 1px solid #eee;
}
/* Don't space out quick links so much */ /* Don't space out quick links so much */
.quick-links { .quick-links {
margin: 40px 0 0; margin: 40px 0 0;
......
docs/base-css.html
View file @ 74521e83
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li> <li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown "> <li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
...@@ -45,20 +46,16 @@ ...@@ -45,20 +46,16 @@
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
=======
<li><a href="./index.html">Overview</a></li>
<li>
<a href="./scaffolding.html">Scaffolding</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
<li class="dropdown active"> <li class="active">
<a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./base-css.html">Base CSS</a>
Base CSS
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li> </li>
<<<<<<< HEAD
<li class="dropdown "> <li class="dropdown ">
<a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
Components Components
...@@ -100,6 +97,16 @@ ...@@ -100,6 +97,16 @@
<a href="./less.html"> <a href="./less.html">
Using LESS Using LESS
</a> </a>
=======
<li>
<a href="./components.html">Components</a>
</li>
<li>
<a href="./javascript.html">Javascript plugins</a>
</li>
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -108,12 +115,28 @@ ...@@ -108,12 +115,28 @@
<div class="container"> <div class="container">
<<<<<<< HEAD
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1> <h1>Base CSS</h1>
<p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p> <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
</header> </header>
=======
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1>
<p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
<ul class="nav pills">
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Typography <!-- Typography
......
docs/components.html
View file @ 74521e83
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li> <li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown "> <li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
...@@ -58,24 +59,19 @@ ...@@ -58,24 +59,19 @@
<li><a href="./base-css.html#buttons">Buttons</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul> </ul>
=======
<li><a href="./index.html">Overview</a></li>
<li>
<a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li class="dropdown active"> <li>
<a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./base-css.html">Base CSS</a>
Components >>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<b class="caret"></b> </li>
</a> <li class="active">
<ul class="dropdown-menu"> <a href="./components.html">Components</a>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</li> </li>
<<<<<<< HEAD
<li class="dropdown "> <li class="dropdown ">
<a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
Javascript plugins Javascript plugins
...@@ -100,6 +96,13 @@ ...@@ -100,6 +96,13 @@
<a href="./less.html"> <a href="./less.html">
Using LESS Using LESS
</a> </a>
=======
<li>
<a href="./javascript.html">Javascript plugins</a>
</li>
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -108,12 +111,33 @@ ...@@ -108,12 +111,33 @@
<div class="container"> <div class="container">
<<<<<<< HEAD
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Components</h1> <h1>Components</h1>
<p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
</header> </header>
=======
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Components</h1>
<p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
<ul class="nav pills">
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
</ul>
</header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Button Groups <!-- Button Groups
......
docs/index.html
View file @ 74521e83
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<li class="active"><a href="./index.html">Overview</a></li> <li class="active"><a href="./index.html">Overview</a></li>
<<<<<<< HEAD
<li class="dropdown "> <li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
Scaffolding Scaffolding
...@@ -100,6 +101,22 @@ ...@@ -100,6 +101,22 @@
<a href="./less.html"> <a href="./less.html">
Using LESS Using LESS
</a> </a>
=======
<li>
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li>
<a href="./base-css.html">Base CSS</a>
</li>
<li>
<a href="./components.html">Components</a>
</li>
<li>
<a href="./javascript.html">Javascript plugins</a>
</li>
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
......
docs/javascript.html
View file @ 74521e83
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li> <li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown "> <li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
...@@ -75,31 +76,30 @@ ...@@ -75,31 +76,30 @@
<li><a href="./components.html#alerts">Alert messages</a></li> <li><a href="./components.html#alerts">Alert messages</a></li>
<li><a href="./components.html#progress">Progress bars</a></li> <li><a href="./components.html#progress">Progress bars</a></li>
</ul> </ul>
=======
<li><a href="./index.html">Overview</a></li>
<li>
<a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li class="dropdown active"> <li>
<a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./base-css.html">Base CSS</a>
Javascript plugins
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li> </li>
<li>
<a href="./components.html">Components</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
<li class="active">
<a href="./javascript.html">Javascript plugins</a>
</li>
<<<<<<< HEAD
<li class=""> <li class="">
<a href="./less.html"> <a href="./less.html">
Using LESS Using LESS
</a> </a>
=======
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -107,6 +107,29 @@ ...@@ -107,6 +107,29 @@
</div> </div>
<div class="container"> <div class="container">
<<<<<<< HEAD
=======
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Javascript for Bootstrap</h1>
<p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
<ul class="nav pills">
<li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/less.html
View file @ 74521e83
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li> <li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown "> <li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
...@@ -95,11 +96,23 @@ ...@@ -95,11 +96,23 @@
<li><a href="./javascript.html#carousel">Carousel</a></li> <li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li> <li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul> </ul>
=======
<li><a href="./index.html">Overview</a></li>
<li>
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li>
<a href="./base-css.html">Base CSS</a>
</li>
<li>
<a href="./components.html">Components</a>
</li>
<li>
<a href="./javascript.html">Javascript plugins</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
<li class="active"> <li class="active">
<a href="./less.html"> <a href="./less.html">Using LESS</a>
Using LESS
</a>
</li> </li>
</ul> </ul>
</div> </div>
......
docs/scaffolding.html
View file @ 74521e83
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li> <li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown active"> <li class="dropdown active">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
...@@ -100,6 +101,23 @@ ...@@ -100,6 +101,23 @@
<a href="./less.html"> <a href="./less.html">
Using LESS Using LESS
</a> </a>
=======
<li><a href="./index.html">Overview</a></li>
<li class="active">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li>
<a href="./base-css.html">Base CSS</a>
</li>
<li>
<a href="./components.html">Components</a>
</li>
<li>
<a href="./javascript.html">Javascript plugins</a>
</li>
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -108,6 +126,7 @@ ...@@ -108,6 +126,7 @@
<div class="container"> <div class="container">
<<<<<<< HEAD
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
...@@ -115,6 +134,19 @@ ...@@ -115,6 +134,19 @@
<h1>Scaffolding</h1> <h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
</header> </header>
=======
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
<ul class="nav pills">
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
......
lib/buttons.less
View file @ 74521e83
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
} }
} }
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
:root .alert-message,
:root .btn { :root .btn {
border-radius: 0 \0; border-radius: 0 \0;
} }
......
lib/forms.less
View file @ 74521e83
...@@ -8,17 +8,25 @@ ...@@ -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 { ...@@ -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);
...@@ -454,13 +463,17 @@ select:focus:required:invalid { ...@@ -454,13 +463,17 @@ select:focus:required:invalid {
// Margin to space out fieldsets // Margin to space out fieldsets
.control-group { .control-group {
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight / 2;
} }
// Horizontal-specific styles // Horizontal-specific styles
// -------------------------- // --------------------------
.form-horizontal { .form-horizontal {
// Increase spacing between groups
.control-group {
margin-bottom: @baseLineHeight;
}
// Float the labels left // Float the labels left
.control-group > label { .control-group > label {
float: left; float: left;
......
lib/reset.less
View file @ 74521e83
// 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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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,
......
lib/responsive.less
View file @ 74521e83
...@@ -97,11 +97,12 @@ ...@@ -97,11 +97,12 @@
// Modals // Modals
.modal { .modal {
position: fixed; position: absolute;
top: 20px; top: 20px;
left: 20px; left: 20px;
right: 20px; right: 20px;
width: auto; width: auto;
margin: 0;
&.fade.in { top: auto; } &.fade.in { top: auto; }
} }
.modal-header .close { .modal-header .close {
......
lib/scaffolding.less
View file @ 74521e83
...@@ -60,8 +60,6 @@ body { ...@@ -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 {
...@@ -75,13 +73,10 @@ a { ...@@ -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 // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
.row { .row {
margin-left: @gridGutterWidth * -1;
.clearfix(); .clearfix();
} }
[class*="span"]:first-child{
margin-left: 0;
}
// Find all .span# classes within .row and give them the necessary properties for grid columns // Find all .span# classes within .row and give them the necessary properties for grid columns
// (supported by all browsers back to IE7) // (supported by all browsers back to IE7)
// Credit to @dhg for the idea // Credit to @dhg for the idea
......
lib/tables.less
View file @ 74521e83
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
// ---------------------------------------- // ----------------------------------------
// BASE TABLES
// -----------------
table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
// BASELINE STYLES // BASELINE STYLES
// --------------- // ---------------
......
lib/thumbnails.less
View file @ 74521e83
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
} }
.thumbnails > li { .thumbnails > li {
float: left; float: left;
margin: 0 0 20px 20px; margin: 0 0 @baseLineHeight 20px;
} }
.thumbnail { .thumbnail {
display: block; display: block;
......
lib/type.less
View file @ 74521e83
...@@ -7,7 +7,7 @@ ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -220,4 +227,12 @@ pre {
padding: 0; padding: 0;
background-color: transparent; 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