0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00

Merge branch '3.0.0-wip' into gh-pages

This commit is contained in:
Mark Otto 2013-08-05 08:34:09 -07:00
commit 250ee7fc10
2 changed files with 3 additions and 2 deletions

View File

@ -123,7 +123,7 @@ body {
/* Download button */ /* Download button */
.bs-masthead .btn-outline { .bs-masthead .btn-outline {
margin-top: 5px; margin-top: 20px;
margin-bottom: 5px; margin-bottom: 5px;
padding: 18px 24px; padding: 18px 24px;
font-size: 21px; font-size: 21px;
@ -833,7 +833,7 @@ input.focused {
.bs-masthead h1 { .bs-masthead h1 {
font-size: 100px; font-size: 100px;
} }
.bs-masthead p { .bs-masthead .lead {
margin-left: 15%; margin-left: 15%;
margin-right: 15%; margin-right: 15%;
font-size: 30px; font-size: 30px;

View File

@ -8,6 +8,7 @@ base_url: "./"
<div class="container"> <div class="container">
<h1>Bootstrap 3</h1> <h1>Bootstrap 3</h1>
<p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p> <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<p><strong>Heads up!</strong> Until the final v3 is released, downloads may be behind the development branch and Bower package.</p>
<p> <p>
<a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a> <a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a>
</p> </p>