Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip

build/assets/font-awesome/less/core.less

@@ -23,7 +23,7 @@
 a {
   [class^="icon-"],
   [class*=" icon-"] {
-    &, &:before { display: inline; }
+    display: inline;
   }
 }
 
@@ -41,19 +41,18 @@ a {
   }
 }
 
-ul.icons-ul {
+.icons-ul {
+  margin-left: @icons-li-width;
   list-style-type: none;
-  text-indent: -10/14em;
-  margin-left: 30/14em;
 
-  > li {
+  > li { position: relative; }
-    .icon-li {
+
-      width: 2/14em;
+  .icon-li {
-      display: inline-block;
+    position: absolute;
-      text-align: right;
+    left: -@icons-li-width;
-      padding-right: 8/14em;
+    width: @icons-li-width;
-    }
+    text-align: center;
-    a .icon-li:before { display: inline-block; }
+    line-height: inherit;
   }
 }
 

build/assets/font-awesome/less/variables.less

@@ -10,7 +10,8 @@
 @iconMuted:          #eee;
 @iconLight:          #fff;
 @iconDark:           #333;
+@icons-li-width:     30/14em;
 
 {% for icon in icons %}
-@{{ icon.id }}: "\{{ icon.unicode }}";
+  @{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}

build/icons.yml

@@ -2159,6 +2159,13 @@ icons:
     categories:
       - Web Application Icons
 
+  - name:       Compass
+    id:         compass
+    unicode:    f14e
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
 
   - name:       Collapse
     id:         collapse
@@ -2323,3 +2330,187 @@ icons:
     created:    3.2.0
     categories:
       - Web Application Icons
+
+  - name:       YouTube Sign
+    id:         youtube-sign
+    unicode:    f166
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       YouTube
+    id:         youtube
+    unicode:    f167
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Xing
+    id:         xing
+    unicode:    f168
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Xing Sign
+    id:         xing-sign
+    unicode:    f169
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       YouTube Play
+    id:         youtube-play
+    unicode:    f16a
+    created:    3.2.0
+    categories:
+      - Brand Icons
+      - Video Player Icons
+
+  - name:       Dropbox
+    id:         dropbox
+    unicode:    f16b
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Stack Exchange
+    id:         stackexchange
+    unicode:    f16c
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Instagram
+    id:         instagram
+    unicode:    f16d
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Flickr
+    id:         flickr
+    unicode:    f16e
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       App.net
+    id:         adn
+    unicode:    f170
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Bitbucket
+    id:         bitbucket
+    unicode:    f171
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Bitbucket Sign
+    id:         bitbucket-sign
+    unicode:    f172
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Tumblr
+    id:         tumblr
+    unicode:    f173
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Tumblr Sign
+    id:         tumblr-sign
+    unicode:    f174
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Long Arrow Down
+    id:         long-arrow-down
+    unicode:    f175
+    created:    3.2.0
+    categories:
+      - Directional Icons
+
+  - name:       Long Arrow Up
+    id:         long-arrow-up
+    unicode:    f176
+    created:    3.2.0
+    categories:
+      - Directional Icons
+
+  - name:       Long Arrow Left
+    id:         long-arrow-left
+    unicode:    f177
+    created:    3.2.0
+    categories:
+      - Directional Icons
+
+  - name:       Long Arrow Right
+    id:         long-arrow-right
+    unicode:    f178
+    created:    3.2.0
+    categories:
+      - Directional Icons
+
+  - name:       Apple
+    id:         apple
+    unicode:    f179
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Windows
+    id:         windows
+    unicode:    f17a
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Android
+    id:         android
+    unicode:    f17b
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Linux
+    id:         linux
+    unicode:    f17c
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Dribble
+    id:         dribble
+    unicode:    f17d
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Skype
+    id:         skype
+    unicode:    f17e
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+
+  - name:       Foursquare
+    id:         foursquare
+    unicode:    f180
+    created:    3.2.0
+    categories:
+      - Brand Icons
+
+  - name:       Trello
+    id:         trello
+    unicode:    f181
+    created:    3.2.0
+    categories:
+      - Brand Icons

build/test.html

@@ -480,7 +480,11 @@ relative_path: ../
         <ul class="icons-ul">
           <li><i class="icon-li icon-double-angle-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
           <li><i class="icon-li icon-arrow-right"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
-          <li><i class="icon-li icon-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><i class="icon-li icon-building"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            <i class="icon-building"></i>
+            <span class="label">foo</span>
+            <a class="btn">foo</a>
+          </li>
         </ul>
       </div>
     </div>
@@ -534,6 +538,35 @@ relative_path: ../
       </div>
     </div>
   </div>
+  <div class="row">
+    <div class="span6">
+      <div style="border: solid 1px #d3d3d3;">
+        <ul class="icons-ul">
+          <li><i class="icon-li icon-refresh icon-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><i class="icon-li icon-spinner icon-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+          <li><i class="icon-li icon-spinner icon-spin"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            <i class="icon-building"></i>
+            <span class="label">foo</span>
+            <a class="btn">foo</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="span6">
+      <div style="border: solid 1px #d3d3d3;">
+        <ul class="icons-ul">
+          <li><i class="icon-li icon-refresh icon-spin icon-large"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+          <li><i class="icon-li icon-spinner icon-spin icon-large"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.</li>
+          <li><i class="icon-li icon-spinner icon-spin icon-large"></i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            <i class="icon-building"></i>
+            <span class="label">foo</span>
+            <a class="btn">foo</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
 
   <div class="row">
     <div class="span6">
@@ -602,6 +635,21 @@ relative_path: ../
     <i class="icon-circle-blank icon-large icon-spin"></i> Loading...
     <button class="btn btn-large"><i class="icon-circle-blank icon-large icon-spin"></i> Loading...</button>
   </div>
+  <h4>Bootstrap Prepend and Append</h4>
+  <div class="row">
+    <div class="span6">
+      <div class="input-prepend">
+        <span class="add-on"><i class="icon-spinner icon-spin"></i></span>
+        <input class="span2" id="prependedInput" type="text" placeholder="Username">
+      </div>
+    </div>
+    <div class="span6">
+      <div class="input-append">
+        <input class="span2" id="appendedInput" type="text">
+        <span class="add-on"><i class="icon-spinner icon-spin"></i></span>
+      </div>
+    </div>
+  </div>
 
   <h3>Stacked icons</h3>
   <div class="well">