rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +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
This commit is contained in:
Mark Otto 2013-07-01 17:32:14 -07:00
commit 7ad9fbef8b
8 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/css/bootstrap.css vendored
View File

@ -3298,6 +3298,7 @@ button.close {
.pagination {
display: inline-block;
padding-left: 0;
margin: 20px 0;
border-radius: 4px;
}
@ -3389,6 +3390,7 @@ button.close {
}
.pager {
padding-left: 0;
margin: 20px 0;
text-align: center;
list-style: none;
@ -4014,7 +4016,7 @@ a.thumbnail:focus {
}
.media-list {
margin-left: 0;
padding-left: 0;
list-style: none;
}

2
docs/examples/navbar-fixed-top.html
View File

@ -60,7 +60,7 @@ title: Fixed navbar template
<h1>Navbar example</h1>
<p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
<p>
<a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
<a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
</p>
</div>

2
docs/examples/navbar-static-top.html
View File

@ -57,7 +57,7 @@ title: Static navbar template
<h1>Navbar example</h1>
<p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
<p>
<a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
<a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
</p>
</div>

2
docs/examples/navbar.html
View File

@ -60,7 +60,7 @@ title: Navbar template
<h1>Navbar example</h1>
<p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
<p>
<a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
<a class="btn btn-large btn-primary" href="/components/#navbar">View navbar docs &raquo;</a>
</p>
</div>

8
docs/getting-started.html
View File

@ -15,7 +15,7 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex
<p class="lead">There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
<h3>Download compiled CSS and JS</h3>
<p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source files are included.</p>
<p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
<p><a class="btn btn-large btn-primary" href="assets/bootstrap.zip" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
<hr>
@ -72,12 +72,6 @@ bootstrap/
├── js/
│ ├── bootstrap.js
│ ├── bootstrap.min.js
└── fonts/
├── glyphiconshalflings-regular.eot
├── glyphiconshalflings-regular.otf
├── glyphiconshalflings-regular.svg
├── glyphiconshalflings-regular.ttf
└── glyphiconshalflings-regular.woff
{% endhighlight %}
<p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p>

2
less/media.less
View File

@ -49,6 +49,6 @@
// Undo default ul/ol styles
.media-list {
margin-left: 0;
padding-left: 0;
list-style: none;
}

1
less/pager.less
View File

@ -4,6 +4,7 @@
.pager {
padding-left: 0;
margin: @line-height-computed 0;
list-style: none;
text-align: center;

1
less/pagination.less
View File

@ -3,6 +3,7 @@
// --------------------------------------------------
.pagination {
display: inline-block;
padding-left: 0;
margin: @line-height-computed 0;
border-radius: @border-radius-base;
}