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

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>

less/glyphicons.less

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

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;