changing name of icon back to fa-search, changin fa-thumbs-up-o to be in line with new conventions

css/font-awesome.css

@@ -248,8 +248,7 @@
 .fa-music:before {
   content: "\f001";
 }
-.fa-search:before,
-.fa-magnifying-glass:before {
+.fa-search:before {
   content: "\f002";
 }
 .fa-envelope-o:before {
@@ -285,10 +284,10 @@
 .fa-times:before {
   content: "\f00d";
 }
-.fa-magnifying-glass-plus:before {
+.fa-search-plus:before {
   content: "\f00e";
 }
-.fa-magnifying-glass-minus:before {
+.fa-search-minus:before {
   content: "\f010";
 }
 .fa-power-off:before {
@@ -631,10 +630,10 @@
 .fa-comments:before {
   content: "\f086";
 }
-.fa-thumbs-up-o:before {
+.fa-thumbs-o-up:before {
   content: "\f087";
 }
-.fa-thumbs-down-o:before {
+.fa-thumbs-o-down:before {
   content: "\f088";
 }
 .fa-star-half:before {

css/font-awesome.min.css

@@ -26,7 +26,7 @@
 .fa-flip-vertical{-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}
 .fa-glass:before{content:"\f000"}
 .fa-music:before{content:"\f001"}
-.fa-search:before,.fa-magnifying-glass:before{content:"\f002"}
+.fa-search:before{content:"\f002"}
 .fa-envelope-o:before{content:"\f003"}
 .fa-heart:before{content:"\f004"}
 .fa-star:before{content:"\f005"}
@@ -38,8 +38,8 @@
 .fa-th-list:before{content:"\f00b"}
 .fa-check:before{content:"\f00c"}
 .fa-times:before{content:"\f00d"}
-.fa-magnifying-glass-plus:before{content:"\f00e"}
-.fa-magnifying-glass-minus:before{content:"\f010"}
+.fa-search-plus:before{content:"\f00e"}
+.fa-search-minus:before{content:"\f010"}
 .fa-power-off:before{content:"\f011"}
 .fa-signal:before{content:"\f012"}
 .fa-gear:before,.fa-cog:before{content:"\f013"}
@@ -151,8 +151,8 @@
 .fa-key:before{content:"\f084"}
 .fa-gears:before,.fa-cogs:before{content:"\f085"}
 .fa-comments:before{content:"\f086"}
-.fa-thumbs-up-o:before{content:"\f087"}
-.fa-thumbs-down-o:before{content:"\f088"}
+.fa-thumbs-o-up:before{content:"\f087"}
+.fa-thumbs-o-down:before{content:"\f088"}
 .fa-star-half:before{content:"\f089"}
 .fa-heart-o:before{content:"\f08a"}
 .fa-sign-out:before{content:"\f08b"}

less/icons.less

@@ -3,8 +3,7 @@
 
 .@{fa-css-prefix}-glass:before { content: @fa-var-glass; }
 .@{fa-css-prefix}-music:before { content: @fa-var-music; }
-.@{fa-css-prefix}-search:before,
-.@{fa-css-prefix}-magnifying-glass:before { content: @fa-var-magnifying-glass; }
+.@{fa-css-prefix}-search:before { content: @fa-var-search; }
 .@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; }
 .@{fa-css-prefix}-heart:before { content: @fa-var-heart; }
 .@{fa-css-prefix}-star:before { content: @fa-var-star; }
@@ -16,8 +15,8 @@
 .@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
 .@{fa-css-prefix}-check:before { content: @fa-var-check; }
 .@{fa-css-prefix}-times:before { content: @fa-var-times; }
-.@{fa-css-prefix}-magnifying-glass-plus:before { content: @fa-var-magnifying-glass-plus; }
-.@{fa-css-prefix}-magnifying-glass-minus:before { content: @fa-var-magnifying-glass-minus; }
+.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
+.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
 .@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; }
 .@{fa-css-prefix}-signal:before { content: @fa-var-signal; }
 .@{fa-css-prefix}-gear:before,
@@ -136,8 +135,8 @@
 .@{fa-css-prefix}-gears:before,
 .@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; }
 .@{fa-css-prefix}-comments:before { content: @fa-var-comments; }
-.@{fa-css-prefix}-thumbs-up-o:before { content: @fa-var-thumbs-up-o; }
-.@{fa-css-prefix}-thumbs-down-o:before { content: @fa-var-thumbs-down-o; }
+.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; }
+.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; }
 .@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; }
 .@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; }
 .@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }

less/variables.less

@@ -13,7 +13,7 @@
 
 @fa-var-glass: "\f000";
 @fa-var-music: "\f001";
-@fa-var-magnifying-glass: "\f002";
+@fa-var-search: "\f002";
 @fa-var-envelope-o: "\f003";
 @fa-var-heart: "\f004";
 @fa-var-star: "\f005";
@@ -25,8 +25,8 @@
 @fa-var-th-list: "\f00b";
 @fa-var-check: "\f00c";
 @fa-var-times: "\f00d";
-@fa-var-magnifying-glass-plus: "\f00e";
-@fa-var-magnifying-glass-minus: "\f010";
+@fa-var-search-plus: "\f00e";
+@fa-var-search-minus: "\f010";
 @fa-var-power-off: "\f011";
 @fa-var-signal: "\f012";
 @fa-var-cog: "\f013";
@@ -138,8 +138,8 @@
 @fa-var-key: "\f084";
 @fa-var-cogs: "\f085";
 @fa-var-comments: "\f086";
-@fa-var-thumbs-up-o: "\f087";
-@fa-var-thumbs-down-o: "\f088";
+@fa-var-thumbs-o-up: "\f087";
+@fa-var-thumbs-o-down: "\f088";
 @fa-var-star-half: "\f089";
 @fa-var-heart-o: "\f08a";
 @fa-var-sign-out: "\f08b";

scss/_icons.scss

@@ -3,8 +3,7 @@
 
 .#{$fa-css-prefix}-glass:before { content: $fa-var-glass; }
 .#{$fa-css-prefix}-music:before { content: $fa-var-music; }
-.#{$fa-css-prefix}-search:before,
-.#{$fa-css-prefix}-magnifying-glass:before { content: $fa-var-magnifying-glass; }
+.#{$fa-css-prefix}-search:before { content: $fa-var-search; }
 .#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; }
 .#{$fa-css-prefix}-heart:before { content: $fa-var-heart; }
 .#{$fa-css-prefix}-star:before { content: $fa-var-star; }
@@ -16,8 +15,8 @@
 .#{$fa-css-prefix}-th-list:before { content: $fa-var-th-list; }
 .#{$fa-css-prefix}-check:before { content: $fa-var-check; }
 .#{$fa-css-prefix}-times:before { content: $fa-var-times; }
-.#{$fa-css-prefix}-magnifying-glass-plus:before { content: $fa-var-magnifying-glass-plus; }
-.#{$fa-css-prefix}-magnifying-glass-minus:before { content: $fa-var-magnifying-glass-minus; }
+.#{$fa-css-prefix}-search-plus:before { content: $fa-var-search-plus; }
+.#{$fa-css-prefix}-search-minus:before { content: $fa-var-search-minus; }
 .#{$fa-css-prefix}-power-off:before { content: $fa-var-power-off; }
 .#{$fa-css-prefix}-signal:before { content: $fa-var-signal; }
 .#{$fa-css-prefix}-gear:before,
@@ -136,8 +135,8 @@
 .#{$fa-css-prefix}-gears:before,
 .#{$fa-css-prefix}-cogs:before { content: $fa-var-cogs; }
 .#{$fa-css-prefix}-comments:before { content: $fa-var-comments; }
-.#{$fa-css-prefix}-thumbs-up-o:before { content: $fa-var-thumbs-up-o; }
-.#{$fa-css-prefix}-thumbs-down-o:before { content: $fa-var-thumbs-down-o; }
+.#{$fa-css-prefix}-thumbs-o-up:before { content: $fa-var-thumbs-o-up; }
+.#{$fa-css-prefix}-thumbs-o-down:before { content: $fa-var-thumbs-o-down; }
 .#{$fa-css-prefix}-star-half:before { content: $fa-var-star-half; }
 .#{$fa-css-prefix}-heart-o:before { content: $fa-var-heart-o; }
 .#{$fa-css-prefix}-sign-out:before { content: $fa-var-sign-out; }

scss/_variables.scss

@@ -13,7 +13,7 @@ $fa-icon-li-width:    (30em / 14);
 
 $fa-var-glass: "\f000";
 $fa-var-music: "\f001";
-$fa-var-magnifying-glass: "\f002";
+$fa-var-search: "\f002";
 $fa-var-envelope-o: "\f003";
 $fa-var-heart: "\f004";
 $fa-var-star: "\f005";
@@ -25,8 +25,8 @@ $fa-var-th: "\f00a";
 $fa-var-th-list: "\f00b";
 $fa-var-check: "\f00c";
 $fa-var-times: "\f00d";
-$fa-var-magnifying-glass-plus: "\f00e";
-$fa-var-magnifying-glass-minus: "\f010";
+$fa-var-search-plus: "\f00e";
+$fa-var-search-minus: "\f010";
 $fa-var-power-off: "\f011";
 $fa-var-signal: "\f012";
 $fa-var-cog: "\f013";
@@ -138,8 +138,8 @@ $fa-var-camera-retro: "\f083";
 $fa-var-key: "\f084";
 $fa-var-cogs: "\f085";
 $fa-var-comments: "\f086";
-$fa-var-thumbs-up-o: "\f087";
-$fa-var-thumbs-down-o: "\f088";
+$fa-var-thumbs-o-up: "\f087";
+$fa-var-thumbs-o-down: "\f088";
 $fa-var-star-half: "\f089";
 $fa-var-heart-o: "\f08a";
 $fa-var-sign-out: "\f08b";

src/_includes/icons/brand.html

@@ -9,7 +9,7 @@
     {% assign icons_brand = icons | expand_aliases | category:"Brand Icons" | sort_by:'class' %}
 
     {% for icon in icons_brand %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 </section>

src/_includes/icons/currency.html

@@ -5,7 +5,7 @@
     {% assign icons_currency = icons | expand_aliases | category:"Currency Icons" | sort_by:'class' %}
 
     {% for icon in icons_currency %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/directional.html

@@ -5,7 +5,7 @@
     {% assign icons_directional = icons | expand_aliases | category:"Directional Icons" | sort_by:'class' %}
 
     {% for icon in icons_directional %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/medical.html

@@ -5,7 +5,7 @@
     {% assign icons_medical = icons | expand_aliases | category:"Medical Icons" | sort_by:'class' %}
 
     {% for icon in icons_medical %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/new.html

@@ -11,7 +11,7 @@
     {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version %}
 
     {% for icon in icons_new %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/text-editor.html

@@ -5,7 +5,7 @@
     {% assign icons_text_editor = icons | expand_aliases | category:"Text Editor Icons" | sort_by:'class' %}
 
     {% for icon in icons_text_editor %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/video-player.html

@@ -5,7 +5,7 @@
     {% assign icons_video_player = icons | expand_aliases | category:"Video Player Icons" | sort_by:'class' %}
 
     {% for icon in icons_video_player %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/icons/web-application.html

@@ -5,7 +5,7 @@
     {% assign icons_web_application = icons | expand_aliases | category:"Web Application Icons" | sort_by:'class' %}
 
     {% for icon in icons_web_application %}
-      <div class="fa-hover col-lg-3 col-md-4 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
+      <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}"></i> fa-{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
   </div>
 

src/_includes/jumbotron-carousel.html

@@ -34,7 +34,7 @@
             <div class="item"><div><i class="fa fa-fighter-jet"></i></div></div>
             <div class="item"><div><i class="fa fa-beer"></i></div></div>
             <div class="item"><div><i class="fa fa-heart-o"></i></div></div>
-            <div class="item"><div><i class="fa fa-thumbs-up-o"></i></div></div>
+            <div class="item"><div><i class="fa fa-thumbs-o-up"></i></div></div>
           </div>
           <!-- Carousel nav -->
           <a class="carousel-control left" href="#icon-carousel" data-slide="prev"

src/_includes/new-features.html

@@ -22,7 +22,7 @@
       Icons have been renamed to improve consistency and predictability.
     </div>
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-thumbs-up-o"></i> Bootstrap 3</h4>
+      <h4><i class="fa fa-thumbs-o-up"></i> Bootstrap 3</h4>
       Font Awesome {{ site.fontawesome.minor_version }} is fully tested and compatible with Bootstrap 3.
     </div>
     <div class="col-md-4 col-sm-6">

src/_includes/tell-me-thanks.html

@@ -6,7 +6,7 @@
   </p>
   <div class="row">
     <div class="col-md-6 col-sm-6">
-      <h3><a href="https://www.gittip.com/davegandy/"><i class="fa fa-gittip"></i> Tip me on Gittip</a></h3>
+      <h3><a href="https://www.gittip.com/davegandy/"><i class="fa fa-gittip padding-right-sm"></i>Tip me on Gittip</a></h3>
       <p>
         Gittip is a great way to let developers know you appreciate their work.
       </p>

src/_includes/why.html

@@ -21,7 +21,7 @@
       Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
     </div>
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-thumbs-up-o"></i> Made for Bootstrap</h4>
+      <h4><i class="fa fa-thumbs-o-up"></i> Made for Bootstrap</h4>
       Designed from scratch to be fully compatible with <a href="{{ site.bootstrap.url }}">Bootstrap {{ site.bootstrap.version }}</a>.
     </div>
     <div class="col-md-4 col-sm-6">

src/community.html

@@ -4,7 +4,7 @@ title: The Font Awesome Community
 navbar_active: community
 relative_path: ../
 ---
-{% capture jumbotron_h1 %}<i class="fa fa-thumbs-up-o"></i>&nbsp; Community{% endcapture %}
+{% capture jumbotron_h1 %}<i class="fa fa-thumbs-o-up"></i>&nbsp; Community{% endcapture %}
 {% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %}
 
 {% include jumbotron.html %}

src/icons.yml

@@ -13,12 +13,10 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Magnifying Glass
-    id:         magnifying-glass
+  - name:       Search
+    id:         search
     unicode:    f002
     created:    1.0
-    aliases:
-      - search
     categories:
       - Web Application Icons
 
@@ -99,22 +97,18 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Magnifying Glass Plus
-    id:         magnifying-glass-plus
+  - name:       Search Plus
+    id:         search-plus
     unicode:    f00e
     created:    1.0
-    alias:
-      - search-plus
     categories:
       - Web Application Icons
 
 
-  - name:       Magnifying Glass Minus
-    id:         magnifying-glass-minus
+  - name:       Search Minus
+    id:         search-minus
     unicode:    f010
     created:    1.0
-    alias:
-      - search-minus
     categories:
       - Web Application Icons
 
@@ -916,15 +910,15 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       thumbs-up-o
-    id:         thumbs-up-o
+  - name:       Thumbs Up Outlined
+    id:         thumbs-o-up
     unicode:    f087
     created:    1.0
     categories:
       - Web Application Icons
 
-  - name:       thumbs-down-o
-    id:         thumbs-down-o
+  - name:       Thumbs Down Outlined
+    id:         thumbs-o-down
     unicode:    f088
     created:    1.0
     categories: