diff options
| author | Mark Otto <[email protected]> | 2013-08-24 12:29:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-24 12:29:45 -0700 |
| commit | 74a778a7e66339f71ba84e4855d54a203f1dd52b (patch) | |
| tree | 909120e4b3c815514f3bddcc4aefb901f8784a89 | |
| parent | ab3e1762d4b20478c83c2eda7a2ff86e8a662020 (diff) | |
| parent | a167a910d9ee79d846b9f8b83ed45a3093cb001c (diff) | |
| download | bootstrap-74a778a7e66339f71ba84e4855d54a203f1dd52b.tar.xz bootstrap-74a778a7e66339f71ba84e4855d54a203f1dd52b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | less/glyphicons.less | 4 | ||||
| -rw-r--r-- | less/mixins.less | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/index.html b/index.html index 187f3b643..71c34922e 100644 --- a/index.html +++ b/index.html @@ -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> diff --git a/less/glyphicons.less b/less/glyphicons.less index 0e0ba986c..7b66e6ba1 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -27,6 +27,10 @@ font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; + + &:empty{ + width: 1em; + } } // Individual icons diff --git a/less/mixins.less b/less/mixins.less index 416c6a222..f956361fd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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; |