diff --git a/css/font-awesome.css b/css/font-awesome.css index 5973811e4..a4a7f0bdc 100644 --- a/css/font-awesome.css +++ b/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 { diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index 7cba667a9..9449e3e29 100644 --- a/css/font-awesome.min.css +++ b/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"} diff --git a/less/icons.less b/less/icons.less index 3e3a97e37..f525c42ff 100644 --- a/less/icons.less +++ b/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; } diff --git a/less/variables.less b/less/variables.less index c91e34994..c3967c8ac 100644 --- a/less/variables.less +++ b/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"; diff --git a/scss/_icons.scss b/scss/_icons.scss index 14eae45b2..456fda710 100644 --- a/scss/_icons.scss +++ b/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; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 6a740aeec..7368f3ebd 100644 --- a/scss/_variables.scss +++ b/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"; diff --git a/src/_includes/icons/brand.html b/src/_includes/icons/brand.html index 3b49a2b34..98bc0189f 100644 --- a/src/_includes/icons/brand.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/currency.html b/src/_includes/icons/currency.html index 882b6265f..6f6942caf 100644 --- a/src/_includes/icons/currency.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/directional.html b/src/_includes/icons/directional.html index 9e9d51e2d..d34b683fb 100644 --- a/src/_includes/icons/directional.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/medical.html b/src/_includes/icons/medical.html index 43c823a07..9fbe1e9f8 100644 --- a/src/_includes/icons/medical.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/new.html b/src/_includes/icons/new.html index 5d550ee94..595391693 100644 --- a/src/_includes/icons/new.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/text-editor.html b/src/_includes/icons/text-editor.html index a963a45a3..4e2ea0315 100644 --- a/src/_includes/icons/text-editor.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/video-player.html b/src/_includes/icons/video-player.html index 57da99f3d..b06679c53 100644 --- a/src/_includes/icons/video-player.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/icons/web-application.html b/src/_includes/icons/web-application.html index 425d5fa3d..5b37b466e 100644 --- a/src/_includes/icons/web-application.html +++ b/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 %} -
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
+
fa-{{ icon.class }}{% if icon.alias_of %} (alias){% endif %}
{% endfor %} diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html index cf446f073..95b4e6cae 100644 --- a/src/_includes/jumbotron-carousel.html +++ b/src/_includes/jumbotron-carousel.html @@ -34,7 +34,7 @@
-
+
-

Bootstrap 3

+

Bootstrap 3

Font Awesome {{ site.fontawesome.minor_version }} is fully tested and compatible with Bootstrap 3.
diff --git a/src/_includes/tell-me-thanks.html b/src/_includes/tell-me-thanks.html index 5c919158b..679c884b2 100644 --- a/src/_includes/tell-me-thanks.html +++ b/src/_includes/tell-me-thanks.html @@ -6,7 +6,7 @@

-

Tip me on Gittip

+

Tip me on Gittip

Gittip is a great way to let developers know you appreciate their work.

diff --git a/src/_includes/why.html b/src/_includes/why.html index 75138dc69..48d73ea0b 100644 --- a/src/_includes/why.html +++ b/src/_includes/why.html @@ -21,7 +21,7 @@ Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
-

Made for Bootstrap

+

Made for Bootstrap

Designed from scratch to be fully compatible with Bootstrap {{ site.bootstrap.version }}.
diff --git a/src/community.html b/src/community.html index c779289ef..ae1bcefb5 100644 --- a/src/community.html +++ b/src/community.html @@ -4,7 +4,7 @@ title: The Font Awesome Community navbar_active: community relative_path: ../ --- -{% capture jumbotron_h1 %}  Community{% endcapture %} +{% capture jumbotron_h1 %}  Community{% endcapture %} {% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %} {% include jumbotron.html %} diff --git a/src/icons.yml b/src/icons.yml index bedcf0245..e77a971ea 100644 --- a/src/icons.yml +++ b/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: