0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2013-08-24 12:29:45 -07:00
commit 74a778a7e6
3 changed files with 9 additions and 1 deletions

View File

@ -9,7 +9,7 @@ base_url: "./"
<h1>Bootstrap</h1>
<p class="lead">Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.</p>
<p>
<a href="{{ site.download }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
<a href="{{ site.download }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a>
</p>
</div>
</main>

View File

@ -27,6 +27,10 @@
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
&:empty{
width: 1em;
}
}
// Individual icons

View File

@ -128,6 +128,10 @@
-webkit-transition: @transition;
transition: @transition;
}
.transition-property(@transition-property) {
-webkit-transition-property: @transition-property;
transition-property: @transition-property;
}
.transition-delay(@transition-delay) {
-webkit-transition-delay: @transition-delay;
transition-delay: @transition-delay;