rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-17 14:54:30 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-07-21 08:52:25 -07:00
commit 12468c6103
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -26,7 +26,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/tw
## Documentation ## Documentation
Bootstrap's documentation, included in this repo in the `/docs` directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). The docs maybe also be run locally. Bootstrap's documentation, included in this repo in the `/docs` directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). The docs may also be run locally.
### Running documentation locally ### Running documentation locally

4
_includes/nav-customize.html
View File

@ -18,7 +18,7 @@
<li><a href="#variables-panels-wells">Panels and wells</a></li> <li><a href="#variables-panels-wells">Panels and wells</a></li>
<li><a href="#variables-accordion">Accordion</a></li> <li><a href="#variables-accordion">Accordion</a></li>
<li><a href="#variables-badges">Badges</a></li> <li><a href="#variables-badges">Badges</a></li>
<li><a href="#variables-breadcrumb">Breadcrumb</a></li> <li><a href="#variables-breadcrumbs">Breadcrumbs</a></li>
<li><a href="#variables-jumbotron">Jumbotron</a></li> <li><a href="#variables-jumbotron">Jumbotron</a></li>
<li><a href="#variables-modals">Modals</a></li> <li><a href="#variables-modals">Modals</a></li>
<li><a href="#variables-list-group">List group</a></li> <li><a href="#variables-list-group">List group</a></li>
@ -32,4 +32,4 @@
</li> </li>
<li> <li>
<a href="#download">Download</a> <a href="#download">Download</a>
</li> </li>

2
css.html
View File

@ -41,7 +41,7 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
<p>These styles can be found within <strong>scaffolding.less</strong>.</p> <p>These styles can be found within <strong>scaffolding.less</strong>.</p>
<h3 id="overview-normalize">Normalize reset</h3> <h3 id="overview-normalize">Normalize reset</h3>
<p>For improved cross-browser rendering, we use <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p> <p>For improved cross-browser rendering, we use <a href="http://necolas.github.io/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
<h3 id="overview-container">Centering with container</h3> <h3 id="overview-container">Centering with container</h3>
<p>Easily center a page's contents by wrapping its contents in a container. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p> <p>Easily center a page's contents by wrapping its contents in a container. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p>

1
dist/css/bootstrap.css vendored
View File

@ -3284,7 +3284,6 @@ button.close {
} }
.breadcrumb > li + li:before { .breadcrumb > li + li:before {
display: inline-block;
padding: 0 5px; padding: 0 5px;
color: #cccccc; color: #cccccc;
content: "/\00a0"; content: "/\00a0";

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
less/breadcrumbs.less
View File

@ -12,7 +12,6 @@
> li { > li {
display: inline-block; display: inline-block;
&+li:before { &+li:before {
display: inline-block;
content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px; padding: 0 5px;
color: @breadcrumb-color; color: @breadcrumb-color;

11
less/button-groups.less
View File

@ -40,11 +40,12 @@
float: left; float: left;
} }
// Space out series of button groups // Space out series of button groups
> .btn + .btn, > .btn,
> .btn-group + .btn, > .btn-group {
> .btn + .btn-group, + .btn,
> .btn-group + .btn-group { + .btn-group {
margin-left: 5px; margin-left: 5px;
}
} }
} }