浏览代码

more naming consistency fixes, adding in new naming conventions doc

davegandy 11 年之前
父节点
当前提交
38ab9001c3

+ 46 - 32
css/font-awesome.css

@@ -250,7 +250,8 @@
 .fa-icon-music:before {
   content: "\f001";
 }
-.fa-icon-search:before {
+.fa-icon-search:before,
+.fa-icon-magnifying-glass:before {
   content: "\f002";
 }
 .fa-icon-envelope-alt:before {
@@ -286,10 +287,10 @@
 .fa-icon-times:before {
   content: "\f00d";
 }
-.fa-icon-zoom-in:before {
+.fa-icon-magnifying-glass-plus:before {
   content: "\f00e";
 }
-.fa-icon-zoom-out:before {
+.fa-icon-magnifying-glass-minus:before {
   content: "\f010";
 }
 .fa-icon-power-off:before {
@@ -302,7 +303,7 @@
 .fa-icon-cog:before {
   content: "\f013";
 }
-.fa-icon-trash:before {
+.fa-icon-trash-alt:before {
   content: "\f014";
 }
 .fa-icon-home:before {
@@ -311,7 +312,7 @@
 .fa-icon-file-alt:before {
   content: "\f016";
 }
-.fa-icon-time:before {
+.fa-icon-clock-alt:before {
   content: "\f017";
 }
 .fa-icon-road:before {
@@ -424,7 +425,7 @@
 .fa-icon-video-camera:before {
   content: "\f03d";
 }
-.fa-icon-picture:before {
+.fa-icon-picture-alt:before {
   content: "\f03e";
 }
 .fa-icon-pencil:before {
@@ -506,7 +507,7 @@
 .fa-icon-info-circle:before {
   content: "\f05a";
 }
-.fa-icon-screenshot:before {
+.fa-icon-crosshairs:before {
   content: "\f05b";
 }
 .fa-icon-times-circle-alt:before {
@@ -564,7 +565,7 @@
 .fa-icon-eye:before {
   content: "\f06e";
 }
-.fa-icon-eye-closed:before {
+.fa-icon-eye-slash:before {
   content: "\f070";
 }
 .fa-icon-warning:before,
@@ -610,7 +611,7 @@
 .fa-icon-resize-horizontal:before {
   content: "\f07e";
 }
-.fa-icon-bar-chart:before {
+.fa-icon-bar-chart-alt:before {
   content: "\f080";
 }
 .fa-icon-twitter-square:before {
@@ -714,16 +715,16 @@
 .fa-icon-certificate:before {
   content: "\f0a3";
 }
-.fa-icon-hand-right:before {
+.fa-icon-hand-alt-right:before {
   content: "\f0a4";
 }
-.fa-icon-hand-left:before {
+.fa-icon-hand-alt-left:before {
   content: "\f0a5";
 }
-.fa-icon-hand-up:before {
+.fa-icon-hand-alt-up:before {
   content: "\f0a6";
 }
-.fa-icon-hand-down:before {
+.fa-icon-hand-alt-down:before {
   content: "\f0a7";
 }
 .fa-icon-arrow-circle-left:before {
@@ -774,14 +775,14 @@
   content: "\f0c4";
 }
 .fa-icon-copy:before,
-.fa-icon-files:before {
+.fa-icon-files-alt:before {
   content: "\f0c5";
 }
 .fa-icon-paperclip:before {
   content: "\f0c6";
 }
 .fa-icon-save:before,
-.fa-icon-floppy:before {
+.fa-icon-floppy-alt:before {
   content: "\f0c7";
 }
 .fa-icon-square:before {
@@ -891,7 +892,7 @@
 .fa-icon-clipboard:before {
   content: "\f0ea";
 }
-.fa-icon-lightbulb:before {
+.fa-icon-lightbulb-alt:before {
   content: "\f0eb";
 }
 .fa-icon-exchange:before {
@@ -948,16 +949,16 @@
 .fa-icon-plus-square:before {
   content: "\f0fe";
 }
-.fa-icon-double-angle-left:before {
+.fa-icon-angle-double-left:before {
   content: "\f100";
 }
-.fa-icon-double-angle-right:before {
+.fa-icon-angle-double-right:before {
   content: "\f101";
 }
-.fa-icon-double-angle-up:before {
+.fa-icon-angle-double-up:before {
   content: "\f102";
 }
-.fa-icon-double-angle-down:before {
+.fa-icon-angle-double-down:before {
   content: "\f103";
 }
 .fa-icon-angle-left:before {
@@ -1019,19 +1020,19 @@
 .fa-icon-collapse-alt:before {
   content: "\f117";
 }
-.fa-icon-smile:before {
+.fa-icon-smile-alt:before {
   content: "\f118";
 }
-.fa-icon-frown:before {
+.fa-icon-frown-alt:before {
   content: "\f119";
 }
-.fa-icon-meh:before {
+.fa-icon-meh-alt:before {
   content: "\f11a";
 }
 .fa-icon-gamepad:before {
   content: "\f11b";
 }
-.fa-icon-keyboard:before {
+.fa-icon-keyboard-alt:before {
   content: "\f11c";
 }
 .fa-icon-flag-alt:before {
@@ -1094,7 +1095,7 @@
 .fa-icon-microphone:before {
   content: "\f130";
 }
-.fa-icon-microphone-off:before {
+.fa-icon-microphone-slash:before {
   content: "\f131";
 }
 .fa-icon-shield:before {
@@ -1181,13 +1182,16 @@
 .fa-icon-compass:before {
   content: "\f14e";
 }
-.fa-icon-collapse-down:before {
+.fa-icon-toggle-down:before,
+.fa-icon-caret-square-alt-down:before {
   content: "\f150";
 }
-.fa-icon-collapse-up:before {
+.fa-icon-toggle-up:before,
+.fa-icon-caret-square-alt-up:before {
   content: "\f151";
 }
-.fa-icon-expand:before {
+.fa-icon-toggle-right:before,
+.fa-icon-caret-square-alt-right:before {
   content: "\f152";
 }
 .fa-icon-euro:before,
@@ -1254,7 +1258,7 @@
 .fa-icon-thumbs-down:before {
   content: "\f165";
 }
-.fa-icon-youtube-sign:before {
+.fa-icon-youtube-square:before {
   content: "\f166";
 }
 .fa-icon-youtube:before {
@@ -1263,7 +1267,7 @@
 .fa-icon-xing:before {
   content: "\f168";
 }
-.fa-icon-xing-sign:before {
+.fa-icon-xing-square:before {
   content: "\f169";
 }
 .fa-icon-youtube-play:before {
@@ -1341,10 +1345,10 @@
 .fa-icon-gittip:before {
   content: "\f184";
 }
-.fa-icon-sun:before {
+.fa-icon-sun-alt:before {
   content: "\f185";
 }
-.fa-icon-moon:before {
+.fa-icon-moon-alt:before {
   content: "\f186";
 }
 .fa-icon-archive:before {
@@ -1368,3 +1372,13 @@
 .fa-icon-stack-exchange:before {
   content: "\f18d";
 }
+.fa-icon-arrow-circle-alt-right:before {
+  content: "\f18e";
+}
+.fa-icon-arrow-circle-alt-left:before {
+  content: "\f190";
+}
+.fa-icon-toggle-left:before,
+.fa-icon-caret-square-alt-left:before {
+  content: "\f191";
+}

+ 35 - 32
css/font-awesome.min.css

@@ -26,7 +26,7 @@
 .fa-icon-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-icon-glass:before{content:"\f000";}
 .fa-icon-music:before{content:"\f001";}
-.fa-icon-search:before{content:"\f002";}
+.fa-icon-search:before,.fa-icon-magnifying-glass:before{content:"\f002";}
 .fa-icon-envelope-alt:before{content:"\f003";}
 .fa-icon-heart:before{content:"\f004";}
 .fa-icon-star:before{content:"\f005";}
@@ -38,15 +38,15 @@
 .fa-icon-th-list:before{content:"\f00b";}
 .fa-icon-check:before{content:"\f00c";}
 .fa-icon-times:before{content:"\f00d";}
-.fa-icon-zoom-in:before{content:"\f00e";}
-.fa-icon-zoom-out:before{content:"\f010";}
+.fa-icon-magnifying-glass-plus:before{content:"\f00e";}
+.fa-icon-magnifying-glass-minus:before{content:"\f010";}
 .fa-icon-power-off:before{content:"\f011";}
 .fa-icon-signal:before{content:"\f012";}
 .fa-icon-gear:before,.fa-icon-cog:before{content:"\f013";}
-.fa-icon-trash:before{content:"\f014";}
+.fa-icon-trash-alt:before{content:"\f014";}
 .fa-icon-home:before{content:"\f015";}
 .fa-icon-file-alt:before{content:"\f016";}
-.fa-icon-time:before{content:"\f017";}
+.fa-icon-clock-alt:before{content:"\f017";}
 .fa-icon-road:before{content:"\f018";}
 .fa-icon-download:before{content:"\f019";}
 .fa-icon-arrow-circle-alt-down:before{content:"\f01a";}
@@ -83,7 +83,7 @@
 .fa-icon-dedent:before,.fa-icon-outdent:before{content:"\f03b";}
 .fa-icon-indent:before{content:"\f03c";}
 .fa-icon-video-camera:before{content:"\f03d";}
-.fa-icon-picture:before{content:"\f03e";}
+.fa-icon-picture-alt:before{content:"\f03e";}
 .fa-icon-pencil:before{content:"\f040";}
 .fa-icon-map-marker:before{content:"\f041";}
 .fa-icon-adjust:before{content:"\f042";}
@@ -110,7 +110,7 @@
 .fa-icon-check-circle:before{content:"\f058";}
 .fa-icon-question-circle:before{content:"\f059";}
 .fa-icon-info-circle:before{content:"\f05a";}
-.fa-icon-screenshot:before{content:"\f05b";}
+.fa-icon-crosshairs:before{content:"\f05b";}
 .fa-icon-times-circle-alt:before{content:"\f05c";}
 .fa-icon-check-circle-alt:before{content:"\f05d";}
 .fa-icon-ban:before{content:"\f05e";}
@@ -129,7 +129,7 @@
 .fa-icon-leaf:before{content:"\f06c";}
 .fa-icon-fire:before{content:"\f06d";}
 .fa-icon-eye:before{content:"\f06e";}
-.fa-icon-eye-closed:before{content:"\f070";}
+.fa-icon-eye-slash:before{content:"\f070";}
 .fa-icon-warning:before,.fa-icon-exclamation-triangle:before{content:"\f071";}
 .fa-icon-plane:before{content:"\f072";}
 .fa-icon-calendar:before{content:"\f073";}
@@ -144,7 +144,7 @@
 .fa-icon-folder-open:before{content:"\f07c";}
 .fa-icon-resize-vertical:before{content:"\f07d";}
 .fa-icon-resize-horizontal:before{content:"\f07e";}
-.fa-icon-bar-chart:before{content:"\f080";}
+.fa-icon-bar-chart-alt:before{content:"\f080";}
 .fa-icon-twitter-square:before{content:"\f081";}
 .fa-icon-facebook-square:before{content:"\f082";}
 .fa-icon-camera-retro:before{content:"\f083";}
@@ -178,10 +178,10 @@
 .fa-icon-bullhorn:before{content:"\f0a1";}
 .fa-icon-bell:before{content:"\f0f3";}
 .fa-icon-certificate:before{content:"\f0a3";}
-.fa-icon-hand-right:before{content:"\f0a4";}
-.fa-icon-hand-left:before{content:"\f0a5";}
-.fa-icon-hand-up:before{content:"\f0a6";}
-.fa-icon-hand-down:before{content:"\f0a7";}
+.fa-icon-hand-alt-right:before{content:"\f0a4";}
+.fa-icon-hand-alt-left:before{content:"\f0a5";}
+.fa-icon-hand-alt-up:before{content:"\f0a6";}
+.fa-icon-hand-alt-down:before{content:"\f0a7";}
 .fa-icon-arrow-circle-left:before{content:"\f0a8";}
 .fa-icon-arrow-circle-right:before{content:"\f0a9";}
 .fa-icon-arrow-circle-up:before{content:"\f0aa";}
@@ -197,9 +197,9 @@
 .fa-icon-cloud:before{content:"\f0c2";}
 .fa-icon-flask:before{content:"\f0c3";}
 .fa-icon-cut:before,.fa-icon-scissors:before{content:"\f0c4";}
-.fa-icon-copy:before,.fa-icon-files:before{content:"\f0c5";}
+.fa-icon-copy:before,.fa-icon-files-alt:before{content:"\f0c5";}
 .fa-icon-paperclip:before{content:"\f0c6";}
-.fa-icon-save:before,.fa-icon-floppy:before{content:"\f0c7";}
+.fa-icon-save:before,.fa-icon-floppy-alt:before{content:"\f0c7";}
 .fa-icon-square:before{content:"\f0c8";}
 .fa-icon-reorder:before{content:"\f0c9";}
 .fa-icon-list-ul:before{content:"\f0ca";}
@@ -233,7 +233,7 @@
 .fa-icon-sitemap:before{content:"\f0e8";}
 .fa-icon-umbrella:before{content:"\f0e9";}
 .fa-icon-paste:before,.fa-icon-clipboard:before{content:"\f0ea";}
-.fa-icon-lightbulb:before{content:"\f0eb";}
+.fa-icon-lightbulb-alt:before{content:"\f0eb";}
 .fa-icon-exchange:before{content:"\f0ec";}
 .fa-icon-cloud-download:before{content:"\f0ed";}
 .fa-icon-cloud-upload:before{content:"\f0ee";}
@@ -252,10 +252,10 @@
 .fa-icon-beer:before{content:"\f0fc";}
 .fa-icon-h-square:before{content:"\f0fd";}
 .fa-icon-plus-square:before{content:"\f0fe";}
-.fa-icon-double-angle-left:before{content:"\f100";}
-.fa-icon-double-angle-right:before{content:"\f101";}
-.fa-icon-double-angle-up:before{content:"\f102";}
-.fa-icon-double-angle-down:before{content:"\f103";}
+.fa-icon-angle-double-left:before{content:"\f100";}
+.fa-icon-angle-double-right:before{content:"\f101";}
+.fa-icon-angle-double-up:before{content:"\f102";}
+.fa-icon-angle-double-down:before{content:"\f103";}
 .fa-icon-angle-left:before{content:"\f104";}
 .fa-icon-angle-right:before{content:"\f105";}
 .fa-icon-angle-up:before{content:"\f106";}
@@ -275,11 +275,11 @@
 .fa-icon-folder-open-alt:before{content:"\f115";}
 .fa-icon-expand-alt:before{content:"\f116";}
 .fa-icon-collapse-alt:before{content:"\f117";}
-.fa-icon-smile:before{content:"\f118";}
-.fa-icon-frown:before{content:"\f119";}
-.fa-icon-meh:before{content:"\f11a";}
+.fa-icon-smile-alt:before{content:"\f118";}
+.fa-icon-frown-alt:before{content:"\f119";}
+.fa-icon-meh-alt:before{content:"\f11a";}
 .fa-icon-gamepad:before{content:"\f11b";}
-.fa-icon-keyboard:before{content:"\f11c";}
+.fa-icon-keyboard-alt:before{content:"\f11c";}
 .fa-icon-flag-alt:before{content:"\f11d";}
 .fa-icon-flag-checkered:before{content:"\f11e";}
 .fa-icon-terminal:before{content:"\f120";}
@@ -299,7 +299,7 @@
 .fa-icon-eraser:before{content:"\f12d";}
 .fa-icon-puzzle-piece:before{content:"\f12e";}
 .fa-icon-microphone:before{content:"\f130";}
-.fa-icon-microphone-off:before{content:"\f131";}
+.fa-icon-microphone-slash:before{content:"\f131";}
 .fa-icon-shield:before{content:"\f132";}
 .fa-icon-calendar-alt:before{content:"\f133";}
 .fa-icon-fire-extinguisher:before{content:"\f134";}
@@ -328,9 +328,9 @@
 .fa-icon-external-link-square:before{content:"\f14c";}
 .fa-icon-share-square:before{content:"\f14d";}
 .fa-icon-compass:before{content:"\f14e";}
-.fa-icon-collapse-down:before{content:"\f150";}
-.fa-icon-collapse-up:before{content:"\f151";}
-.fa-icon-expand:before{content:"\f152";}
+.fa-icon-toggle-down:before,.fa-icon-caret-square-alt-down:before{content:"\f150";}
+.fa-icon-toggle-up:before,.fa-icon-caret-square-alt-up:before{content:"\f151";}
+.fa-icon-toggle-right:before,.fa-icon-caret-square-alt-right:before{content:"\f152";}
 .fa-icon-euro:before,.fa-icon-eur:before{content:"\f153";}
 .fa-icon-gbp:before{content:"\f154";}
 .fa-icon-dollar:before,.fa-icon-usd:before{content:"\f155";}
@@ -349,10 +349,10 @@
 .fa-icon-sort-numeric-desc:before{content:"\f163";}
 .fa-icon-thumbs-up:before{content:"\f164";}
 .fa-icon-thumbs-down:before{content:"\f165";}
-.fa-icon-youtube-sign:before{content:"\f166";}
+.fa-icon-youtube-square:before{content:"\f166";}
 .fa-icon-youtube:before{content:"\f167";}
 .fa-icon-xing:before{content:"\f168";}
-.fa-icon-xing-sign:before{content:"\f169";}
+.fa-icon-xing-square:before{content:"\f169";}
 .fa-icon-youtube-play:before{content:"\f16a";}
 .fa-icon-dropbox:before{content:"\f16b";}
 .fa-icon-stack-overflow:before{content:"\f16c";}
@@ -378,8 +378,8 @@
 .fa-icon-female:before{content:"\f182";}
 .fa-icon-male:before{content:"\f183";}
 .fa-icon-gittip:before{content:"\f184";}
-.fa-icon-sun:before{content:"\f185";}
-.fa-icon-moon:before{content:"\f186";}
+.fa-icon-sun-alt:before{content:"\f185";}
+.fa-icon-moon-alt:before{content:"\f186";}
 .fa-icon-archive:before{content:"\f187";}
 .fa-icon-bug:before{content:"\f188";}
 .fa-icon-vk:before{content:"\f189";}
@@ -387,3 +387,6 @@
 .fa-icon-renren:before{content:"\f18b";}
 .fa-icon-pagelines:before{content:"\f18c";}
 .fa-icon-stack-exchange:before{content:"\f18d";}
+.fa-icon-arrow-circle-alt-right:before{content:"\f18e";}
+.fa-icon-arrow-circle-alt-left:before{content:"\f190";}
+.fa-icon-toggle-left:before,.fa-icon-caret-square-alt-left:before{content:"\f191";}

二进制
fonts/FontAwesome.otf


+ 40 - 32
less/icons.less

@@ -3,7 +3,8 @@
 
 .fa-icon-glass:before { content: @fa-icon-glass; }
 .fa-icon-music:before { content: @fa-icon-music; }
-.fa-icon-search:before { content: @fa-icon-search; }
+.fa-icon-search:before,
+.fa-icon-magnifying-glass:before { content: @fa-icon-magnifying-glass; }
 .fa-icon-envelope-alt:before { content: @fa-icon-envelope-alt; }
 .fa-icon-heart:before { content: @fa-icon-heart; }
 .fa-icon-star:before { content: @fa-icon-star; }
@@ -15,16 +16,16 @@
 .fa-icon-th-list:before { content: @fa-icon-th-list; }
 .fa-icon-check:before { content: @fa-icon-check; }
 .fa-icon-times:before { content: @fa-icon-times; }
-.fa-icon-zoom-in:before { content: @fa-icon-zoom-in; }
-.fa-icon-zoom-out:before { content: @fa-icon-zoom-out; }
+.fa-icon-magnifying-glass-plus:before { content: @fa-icon-magnifying-glass-plus; }
+.fa-icon-magnifying-glass-minus:before { content: @fa-icon-magnifying-glass-minus; }
 .fa-icon-power-off:before { content: @fa-icon-power-off; }
 .fa-icon-signal:before { content: @fa-icon-signal; }
 .fa-icon-gear:before,
 .fa-icon-cog:before { content: @fa-icon-cog; }
-.fa-icon-trash:before { content: @fa-icon-trash; }
+.fa-icon-trash-alt:before { content: @fa-icon-trash-alt; }
 .fa-icon-home:before { content: @fa-icon-home; }
 .fa-icon-file-alt:before { content: @fa-icon-file-alt; }
-.fa-icon-time:before { content: @fa-icon-time; }
+.fa-icon-clock-alt:before { content: @fa-icon-clock-alt; }
 .fa-icon-road:before { content: @fa-icon-road; }
 .fa-icon-download:before { content: @fa-icon-download; }
 .fa-icon-arrow-circle-alt-down:before { content: @fa-icon-arrow-circle-alt-down; }
@@ -63,7 +64,7 @@
 .fa-icon-outdent:before { content: @fa-icon-outdent; }
 .fa-icon-indent:before { content: @fa-icon-indent; }
 .fa-icon-video-camera:before { content: @fa-icon-video-camera; }
-.fa-icon-picture:before { content: @fa-icon-picture; }
+.fa-icon-picture-alt:before { content: @fa-icon-picture-alt; }
 .fa-icon-pencil:before { content: @fa-icon-pencil; }
 .fa-icon-map-marker:before { content: @fa-icon-map-marker; }
 .fa-icon-adjust:before { content: @fa-icon-adjust; }
@@ -91,7 +92,7 @@
 .fa-icon-check-circle:before { content: @fa-icon-check-circle; }
 .fa-icon-question-circle:before { content: @fa-icon-question-circle; }
 .fa-icon-info-circle:before { content: @fa-icon-info-circle; }
-.fa-icon-screenshot:before { content: @fa-icon-screenshot; }
+.fa-icon-crosshairs:before { content: @fa-icon-crosshairs; }
 .fa-icon-times-circle-alt:before { content: @fa-icon-times-circle-alt; }
 .fa-icon-check-circle-alt:before { content: @fa-icon-check-circle-alt; }
 .fa-icon-ban:before { content: @fa-icon-ban; }
@@ -111,7 +112,7 @@
 .fa-icon-leaf:before { content: @fa-icon-leaf; }
 .fa-icon-fire:before { content: @fa-icon-fire; }
 .fa-icon-eye:before { content: @fa-icon-eye; }
-.fa-icon-eye-closed:before { content: @fa-icon-eye-closed; }
+.fa-icon-eye-slash:before { content: @fa-icon-eye-slash; }
 .fa-icon-warning:before,
 .fa-icon-exclamation-triangle:before { content: @fa-icon-exclamation-triangle; }
 .fa-icon-plane:before { content: @fa-icon-plane; }
@@ -127,7 +128,7 @@
 .fa-icon-folder-open:before { content: @fa-icon-folder-open; }
 .fa-icon-resize-vertical:before { content: @fa-icon-resize-vertical; }
 .fa-icon-resize-horizontal:before { content: @fa-icon-resize-horizontal; }
-.fa-icon-bar-chart:before { content: @fa-icon-bar-chart; }
+.fa-icon-bar-chart-alt:before { content: @fa-icon-bar-chart-alt; }
 .fa-icon-twitter-square:before { content: @fa-icon-twitter-square; }
 .fa-icon-facebook-square:before { content: @fa-icon-facebook-square; }
 .fa-icon-camera-retro:before { content: @fa-icon-camera-retro; }
@@ -163,10 +164,10 @@
 .fa-icon-bullhorn:before { content: @fa-icon-bullhorn; }
 .fa-icon-bell:before { content: @fa-icon-bell; }
 .fa-icon-certificate:before { content: @fa-icon-certificate; }
-.fa-icon-hand-right:before { content: @fa-icon-hand-right; }
-.fa-icon-hand-left:before { content: @fa-icon-hand-left; }
-.fa-icon-hand-up:before { content: @fa-icon-hand-up; }
-.fa-icon-hand-down:before { content: @fa-icon-hand-down; }
+.fa-icon-hand-alt-right:before { content: @fa-icon-hand-alt-right; }
+.fa-icon-hand-alt-left:before { content: @fa-icon-hand-alt-left; }
+.fa-icon-hand-alt-up:before { content: @fa-icon-hand-alt-up; }
+.fa-icon-hand-alt-down:before { content: @fa-icon-hand-alt-down; }
 .fa-icon-arrow-circle-left:before { content: @fa-icon-arrow-circle-left; }
 .fa-icon-arrow-circle-right:before { content: @fa-icon-arrow-circle-right; }
 .fa-icon-arrow-circle-up:before { content: @fa-icon-arrow-circle-up; }
@@ -185,10 +186,10 @@
 .fa-icon-cut:before,
 .fa-icon-scissors:before { content: @fa-icon-scissors; }
 .fa-icon-copy:before,
-.fa-icon-files:before { content: @fa-icon-files; }
+.fa-icon-files-alt:before { content: @fa-icon-files-alt; }
 .fa-icon-paperclip:before { content: @fa-icon-paperclip; }
 .fa-icon-save:before,
-.fa-icon-floppy:before { content: @fa-icon-floppy; }
+.fa-icon-floppy-alt:before { content: @fa-icon-floppy-alt; }
 .fa-icon-square:before { content: @fa-icon-square; }
 .fa-icon-reorder:before { content: @fa-icon-reorder; }
 .fa-icon-list-ul:before { content: @fa-icon-list-ul; }
@@ -230,7 +231,7 @@
 .fa-icon-umbrella:before { content: @fa-icon-umbrella; }
 .fa-icon-paste:before,
 .fa-icon-clipboard:before { content: @fa-icon-clipboard; }
-.fa-icon-lightbulb:before { content: @fa-icon-lightbulb; }
+.fa-icon-lightbulb-alt:before { content: @fa-icon-lightbulb-alt; }
 .fa-icon-exchange:before { content: @fa-icon-exchange; }
 .fa-icon-cloud-download:before { content: @fa-icon-cloud-download; }
 .fa-icon-cloud-upload:before { content: @fa-icon-cloud-upload; }
@@ -249,10 +250,10 @@
 .fa-icon-beer:before { content: @fa-icon-beer; }
 .fa-icon-h-square:before { content: @fa-icon-h-square; }
 .fa-icon-plus-square:before { content: @fa-icon-plus-square; }
-.fa-icon-double-angle-left:before { content: @fa-icon-double-angle-left; }
-.fa-icon-double-angle-right:before { content: @fa-icon-double-angle-right; }
-.fa-icon-double-angle-up:before { content: @fa-icon-double-angle-up; }
-.fa-icon-double-angle-down:before { content: @fa-icon-double-angle-down; }
+.fa-icon-angle-double-left:before { content: @fa-icon-angle-double-left; }
+.fa-icon-angle-double-right:before { content: @fa-icon-angle-double-right; }
+.fa-icon-angle-double-up:before { content: @fa-icon-angle-double-up; }
+.fa-icon-angle-double-down:before { content: @fa-icon-angle-double-down; }
 .fa-icon-angle-left:before { content: @fa-icon-angle-left; }
 .fa-icon-angle-right:before { content: @fa-icon-angle-right; }
 .fa-icon-angle-up:before { content: @fa-icon-angle-up; }
@@ -274,11 +275,11 @@
 .fa-icon-folder-open-alt:before { content: @fa-icon-folder-open-alt; }
 .fa-icon-expand-alt:before { content: @fa-icon-expand-alt; }
 .fa-icon-collapse-alt:before { content: @fa-icon-collapse-alt; }
-.fa-icon-smile:before { content: @fa-icon-smile; }
-.fa-icon-frown:before { content: @fa-icon-frown; }
-.fa-icon-meh:before { content: @fa-icon-meh; }
+.fa-icon-smile-alt:before { content: @fa-icon-smile-alt; }
+.fa-icon-frown-alt:before { content: @fa-icon-frown-alt; }
+.fa-icon-meh-alt:before { content: @fa-icon-meh-alt; }
 .fa-icon-gamepad:before { content: @fa-icon-gamepad; }
-.fa-icon-keyboard:before { content: @fa-icon-keyboard; }
+.fa-icon-keyboard-alt:before { content: @fa-icon-keyboard-alt; }
 .fa-icon-flag-alt:before { content: @fa-icon-flag-alt; }
 .fa-icon-flag-checkered:before { content: @fa-icon-flag-checkered; }
 .fa-icon-terminal:before { content: @fa-icon-terminal; }
@@ -301,7 +302,7 @@
 .fa-icon-eraser:before { content: @fa-icon-eraser; }
 .fa-icon-puzzle-piece:before { content: @fa-icon-puzzle-piece; }
 .fa-icon-microphone:before { content: @fa-icon-microphone; }
-.fa-icon-microphone-off:before { content: @fa-icon-microphone-off; }
+.fa-icon-microphone-slash:before { content: @fa-icon-microphone-slash; }
 .fa-icon-shield:before { content: @fa-icon-shield; }
 .fa-icon-calendar-alt:before { content: @fa-icon-calendar-alt; }
 .fa-icon-fire-extinguisher:before { content: @fa-icon-fire-extinguisher; }
@@ -330,9 +331,12 @@
 .fa-icon-external-link-square:before { content: @fa-icon-external-link-square; }
 .fa-icon-share-square:before { content: @fa-icon-share-square; }
 .fa-icon-compass:before { content: @fa-icon-compass; }
-.fa-icon-collapse-down:before { content: @fa-icon-collapse-down; }
-.fa-icon-collapse-up:before { content: @fa-icon-collapse-up; }
-.fa-icon-expand:before { content: @fa-icon-expand; }
+.fa-icon-toggle-down:before,
+.fa-icon-caret-square-alt-down:before { content: @fa-icon-caret-square-alt-down; }
+.fa-icon-toggle-up:before,
+.fa-icon-caret-square-alt-up:before { content: @fa-icon-caret-square-alt-up; }
+.fa-icon-toggle-right:before,
+.fa-icon-caret-square-alt-right:before { content: @fa-icon-caret-square-alt-right; }
 .fa-icon-euro:before,
 .fa-icon-eur:before { content: @fa-icon-eur; }
 .fa-icon-gbp:before { content: @fa-icon-gbp; }
@@ -361,10 +365,10 @@
 .fa-icon-sort-numeric-desc:before { content: @fa-icon-sort-numeric-desc; }
 .fa-icon-thumbs-up:before { content: @fa-icon-thumbs-up; }
 .fa-icon-thumbs-down:before { content: @fa-icon-thumbs-down; }
-.fa-icon-youtube-sign:before { content: @fa-icon-youtube-sign; }
+.fa-icon-youtube-square:before { content: @fa-icon-youtube-square; }
 .fa-icon-youtube:before { content: @fa-icon-youtube; }
 .fa-icon-xing:before { content: @fa-icon-xing; }
-.fa-icon-xing-sign:before { content: @fa-icon-xing-sign; }
+.fa-icon-xing-square:before { content: @fa-icon-xing-square; }
 .fa-icon-youtube-play:before { content: @fa-icon-youtube-play; }
 .fa-icon-dropbox:before { content: @fa-icon-dropbox; }
 .fa-icon-stack-overflow:before { content: @fa-icon-stack-overflow; }
@@ -390,8 +394,8 @@
 .fa-icon-female:before { content: @fa-icon-female; }
 .fa-icon-male:before { content: @fa-icon-male; }
 .fa-icon-gittip:before { content: @fa-icon-gittip; }
-.fa-icon-sun:before { content: @fa-icon-sun; }
-.fa-icon-moon:before { content: @fa-icon-moon; }
+.fa-icon-sun-alt:before { content: @fa-icon-sun-alt; }
+.fa-icon-moon-alt:before { content: @fa-icon-moon-alt; }
 .fa-icon-archive:before { content: @fa-icon-archive; }
 .fa-icon-bug:before { content: @fa-icon-bug; }
 .fa-icon-vk:before { content: @fa-icon-vk; }
@@ -399,3 +403,7 @@
 .fa-icon-renren:before { content: @fa-icon-renren; }
 .fa-icon-pagelines:before { content: @fa-icon-pagelines; }
 .fa-icon-stack-exchange:before { content: @fa-icon-stack-exchange; }
+.fa-icon-arrow-circle-alt-right:before { content: @fa-icon-arrow-circle-alt-right; }
+.fa-icon-arrow-circle-alt-left:before { content: @fa-icon-arrow-circle-alt-left; }
+.fa-icon-toggle-left:before,
+.fa-icon-caret-square-alt-left:before { content: @fa-icon-caret-square-alt-left; }

+ 35 - 32
less/variables.less

@@ -12,7 +12,7 @@
 
 @fa-icon-glass: "\f000";
 @fa-icon-music: "\f001";
-@fa-icon-search: "\f002";
+@fa-icon-magnifying-glass: "\f002";
 @fa-icon-envelope-alt: "\f003";
 @fa-icon-heart: "\f004";
 @fa-icon-star: "\f005";
@@ -24,15 +24,15 @@
 @fa-icon-th-list: "\f00b";
 @fa-icon-check: "\f00c";
 @fa-icon-times: "\f00d";
-@fa-icon-zoom-in: "\f00e";
-@fa-icon-zoom-out: "\f010";
+@fa-icon-magnifying-glass-plus: "\f00e";
+@fa-icon-magnifying-glass-minus: "\f010";
 @fa-icon-power-off: "\f011";
 @fa-icon-signal: "\f012";
 @fa-icon-cog: "\f013";
-@fa-icon-trash: "\f014";
+@fa-icon-trash-alt: "\f014";
 @fa-icon-home: "\f015";
 @fa-icon-file-alt: "\f016";
-@fa-icon-time: "\f017";
+@fa-icon-clock-alt: "\f017";
 @fa-icon-road: "\f018";
 @fa-icon-download: "\f019";
 @fa-icon-arrow-circle-alt-down: "\f01a";
@@ -69,7 +69,7 @@
 @fa-icon-outdent: "\f03b";
 @fa-icon-indent: "\f03c";
 @fa-icon-video-camera: "\f03d";
-@fa-icon-picture: "\f03e";
+@fa-icon-picture-alt: "\f03e";
 @fa-icon-pencil: "\f040";
 @fa-icon-map-marker: "\f041";
 @fa-icon-adjust: "\f042";
@@ -96,7 +96,7 @@
 @fa-icon-check-circle: "\f058";
 @fa-icon-question-circle: "\f059";
 @fa-icon-info-circle: "\f05a";
-@fa-icon-screenshot: "\f05b";
+@fa-icon-crosshairs: "\f05b";
 @fa-icon-times-circle-alt: "\f05c";
 @fa-icon-check-circle-alt: "\f05d";
 @fa-icon-ban: "\f05e";
@@ -115,7 +115,7 @@
 @fa-icon-leaf: "\f06c";
 @fa-icon-fire: "\f06d";
 @fa-icon-eye: "\f06e";
-@fa-icon-eye-closed: "\f070";
+@fa-icon-eye-slash: "\f070";
 @fa-icon-exclamation-triangle: "\f071";
 @fa-icon-plane: "\f072";
 @fa-icon-calendar: "\f073";
@@ -130,7 +130,7 @@
 @fa-icon-folder-open: "\f07c";
 @fa-icon-resize-vertical: "\f07d";
 @fa-icon-resize-horizontal: "\f07e";
-@fa-icon-bar-chart: "\f080";
+@fa-icon-bar-chart-alt: "\f080";
 @fa-icon-twitter-square: "\f081";
 @fa-icon-facebook-square: "\f082";
 @fa-icon-camera-retro: "\f083";
@@ -164,10 +164,10 @@
 @fa-icon-bullhorn: "\f0a1";
 @fa-icon-bell: "\f0f3";
 @fa-icon-certificate: "\f0a3";
-@fa-icon-hand-right: "\f0a4";
-@fa-icon-hand-left: "\f0a5";
-@fa-icon-hand-up: "\f0a6";
-@fa-icon-hand-down: "\f0a7";
+@fa-icon-hand-alt-right: "\f0a4";
+@fa-icon-hand-alt-left: "\f0a5";
+@fa-icon-hand-alt-up: "\f0a6";
+@fa-icon-hand-alt-down: "\f0a7";
 @fa-icon-arrow-circle-left: "\f0a8";
 @fa-icon-arrow-circle-right: "\f0a9";
 @fa-icon-arrow-circle-up: "\f0aa";
@@ -183,9 +183,9 @@
 @fa-icon-cloud: "\f0c2";
 @fa-icon-flask: "\f0c3";
 @fa-icon-scissors: "\f0c4";
-@fa-icon-files: "\f0c5";
+@fa-icon-files-alt: "\f0c5";
 @fa-icon-paperclip: "\f0c6";
-@fa-icon-floppy: "\f0c7";
+@fa-icon-floppy-alt: "\f0c7";
 @fa-icon-square: "\f0c8";
 @fa-icon-reorder: "\f0c9";
 @fa-icon-list-ul: "\f0ca";
@@ -219,7 +219,7 @@
 @fa-icon-sitemap: "\f0e8";
 @fa-icon-umbrella: "\f0e9";
 @fa-icon-clipboard: "\f0ea";
-@fa-icon-lightbulb: "\f0eb";
+@fa-icon-lightbulb-alt: "\f0eb";
 @fa-icon-exchange: "\f0ec";
 @fa-icon-cloud-download: "\f0ed";
 @fa-icon-cloud-upload: "\f0ee";
@@ -238,10 +238,10 @@
 @fa-icon-beer: "\f0fc";
 @fa-icon-h-square: "\f0fd";
 @fa-icon-plus-square: "\f0fe";
-@fa-icon-double-angle-left: "\f100";
-@fa-icon-double-angle-right: "\f101";
-@fa-icon-double-angle-up: "\f102";
-@fa-icon-double-angle-down: "\f103";
+@fa-icon-angle-double-left: "\f100";
+@fa-icon-angle-double-right: "\f101";
+@fa-icon-angle-double-up: "\f102";
+@fa-icon-angle-double-down: "\f103";
 @fa-icon-angle-left: "\f104";
 @fa-icon-angle-right: "\f105";
 @fa-icon-angle-up: "\f106";
@@ -261,11 +261,11 @@
 @fa-icon-folder-open-alt: "\f115";
 @fa-icon-expand-alt: "\f116";
 @fa-icon-collapse-alt: "\f117";
-@fa-icon-smile: "\f118";
-@fa-icon-frown: "\f119";
-@fa-icon-meh: "\f11a";
+@fa-icon-smile-alt: "\f118";
+@fa-icon-frown-alt: "\f119";
+@fa-icon-meh-alt: "\f11a";
 @fa-icon-gamepad: "\f11b";
-@fa-icon-keyboard: "\f11c";
+@fa-icon-keyboard-alt: "\f11c";
 @fa-icon-flag-alt: "\f11d";
 @fa-icon-flag-checkered: "\f11e";
 @fa-icon-terminal: "\f120";
@@ -285,7 +285,7 @@
 @fa-icon-eraser: "\f12d";
 @fa-icon-puzzle-piece: "\f12e";
 @fa-icon-microphone: "\f130";
-@fa-icon-microphone-off: "\f131";
+@fa-icon-microphone-slash: "\f131";
 @fa-icon-shield: "\f132";
 @fa-icon-calendar-alt: "\f133";
 @fa-icon-fire-extinguisher: "\f134";
@@ -314,9 +314,9 @@
 @fa-icon-external-link-square: "\f14c";
 @fa-icon-share-square: "\f14d";
 @fa-icon-compass: "\f14e";
-@fa-icon-collapse-down: "\f150";
-@fa-icon-collapse-up: "\f151";
-@fa-icon-expand: "\f152";
+@fa-icon-caret-square-alt-down: "\f150";
+@fa-icon-caret-square-alt-up: "\f151";
+@fa-icon-caret-square-alt-right: "\f152";
 @fa-icon-eur: "\f153";
 @fa-icon-gbp: "\f154";
 @fa-icon-usd: "\f155";
@@ -335,10 +335,10 @@
 @fa-icon-sort-numeric-desc: "\f163";
 @fa-icon-thumbs-up: "\f164";
 @fa-icon-thumbs-down: "\f165";
-@fa-icon-youtube-sign: "\f166";
+@fa-icon-youtube-square: "\f166";
 @fa-icon-youtube: "\f167";
 @fa-icon-xing: "\f168";
-@fa-icon-xing-sign: "\f169";
+@fa-icon-xing-square: "\f169";
 @fa-icon-youtube-play: "\f16a";
 @fa-icon-dropbox: "\f16b";
 @fa-icon-stack-overflow: "\f16c";
@@ -364,8 +364,8 @@
 @fa-icon-female: "\f182";
 @fa-icon-male: "\f183";
 @fa-icon-gittip: "\f184";
-@fa-icon-sun: "\f185";
-@fa-icon-moon: "\f186";
+@fa-icon-sun-alt: "\f185";
+@fa-icon-moon-alt: "\f186";
 @fa-icon-archive: "\f187";
 @fa-icon-bug: "\f188";
 @fa-icon-vk: "\f189";
@@ -373,4 +373,7 @@
 @fa-icon-renren: "\f18b";
 @fa-icon-pagelines: "\f18c";
 @fa-icon-stack-exchange: "\f18d";
+@fa-icon-arrow-circle-alt-right: "\f18e";
+@fa-icon-arrow-circle-alt-left: "\f190";
+@fa-icon-caret-square-alt-left: "\f191";
 

+ 40 - 32
scss/_icons.scss

@@ -3,7 +3,8 @@
 
 .fa-icon-glass:before { content: $fa-icon-glass; }
 .fa-icon-music:before { content: $fa-icon-music; }
-.fa-icon-search:before { content: $fa-icon-search; }
+.fa-icon-search:before,
+.fa-icon-magnifying-glass:before { content: $fa-icon-magnifying-glass; }
 .fa-icon-envelope-alt:before { content: $fa-icon-envelope-alt; }
 .fa-icon-heart:before { content: $fa-icon-heart; }
 .fa-icon-star:before { content: $fa-icon-star; }
@@ -15,16 +16,16 @@
 .fa-icon-th-list:before { content: $fa-icon-th-list; }
 .fa-icon-check:before { content: $fa-icon-check; }
 .fa-icon-times:before { content: $fa-icon-times; }
-.fa-icon-zoom-in:before { content: $fa-icon-zoom-in; }
-.fa-icon-zoom-out:before { content: $fa-icon-zoom-out; }
+.fa-icon-magnifying-glass-plus:before { content: $fa-icon-magnifying-glass-plus; }
+.fa-icon-magnifying-glass-minus:before { content: $fa-icon-magnifying-glass-minus; }
 .fa-icon-power-off:before { content: $fa-icon-power-off; }
 .fa-icon-signal:before { content: $fa-icon-signal; }
 .fa-icon-gear:before,
 .fa-icon-cog:before { content: $fa-icon-cog; }
-.fa-icon-trash:before { content: $fa-icon-trash; }
+.fa-icon-trash-alt:before { content: $fa-icon-trash-alt; }
 .fa-icon-home:before { content: $fa-icon-home; }
 .fa-icon-file-alt:before { content: $fa-icon-file-alt; }
-.fa-icon-time:before { content: $fa-icon-time; }
+.fa-icon-clock-alt:before { content: $fa-icon-clock-alt; }
 .fa-icon-road:before { content: $fa-icon-road; }
 .fa-icon-download:before { content: $fa-icon-download; }
 .fa-icon-arrow-circle-alt-down:before { content: $fa-icon-arrow-circle-alt-down; }
@@ -63,7 +64,7 @@
 .fa-icon-outdent:before { content: $fa-icon-outdent; }
 .fa-icon-indent:before { content: $fa-icon-indent; }
 .fa-icon-video-camera:before { content: $fa-icon-video-camera; }
-.fa-icon-picture:before { content: $fa-icon-picture; }
+.fa-icon-picture-alt:before { content: $fa-icon-picture-alt; }
 .fa-icon-pencil:before { content: $fa-icon-pencil; }
 .fa-icon-map-marker:before { content: $fa-icon-map-marker; }
 .fa-icon-adjust:before { content: $fa-icon-adjust; }
@@ -91,7 +92,7 @@
 .fa-icon-check-circle:before { content: $fa-icon-check-circle; }
 .fa-icon-question-circle:before { content: $fa-icon-question-circle; }
 .fa-icon-info-circle:before { content: $fa-icon-info-circle; }
-.fa-icon-screenshot:before { content: $fa-icon-screenshot; }
+.fa-icon-crosshairs:before { content: $fa-icon-crosshairs; }
 .fa-icon-times-circle-alt:before { content: $fa-icon-times-circle-alt; }
 .fa-icon-check-circle-alt:before { content: $fa-icon-check-circle-alt; }
 .fa-icon-ban:before { content: $fa-icon-ban; }
@@ -111,7 +112,7 @@
 .fa-icon-leaf:before { content: $fa-icon-leaf; }
 .fa-icon-fire:before { content: $fa-icon-fire; }
 .fa-icon-eye:before { content: $fa-icon-eye; }
-.fa-icon-eye-closed:before { content: $fa-icon-eye-closed; }
+.fa-icon-eye-slash:before { content: $fa-icon-eye-slash; }
 .fa-icon-warning:before,
 .fa-icon-exclamation-triangle:before { content: $fa-icon-exclamation-triangle; }
 .fa-icon-plane:before { content: $fa-icon-plane; }
@@ -127,7 +128,7 @@
 .fa-icon-folder-open:before { content: $fa-icon-folder-open; }
 .fa-icon-resize-vertical:before { content: $fa-icon-resize-vertical; }
 .fa-icon-resize-horizontal:before { content: $fa-icon-resize-horizontal; }
-.fa-icon-bar-chart:before { content: $fa-icon-bar-chart; }
+.fa-icon-bar-chart-alt:before { content: $fa-icon-bar-chart-alt; }
 .fa-icon-twitter-square:before { content: $fa-icon-twitter-square; }
 .fa-icon-facebook-square:before { content: $fa-icon-facebook-square; }
 .fa-icon-camera-retro:before { content: $fa-icon-camera-retro; }
@@ -163,10 +164,10 @@
 .fa-icon-bullhorn:before { content: $fa-icon-bullhorn; }
 .fa-icon-bell:before { content: $fa-icon-bell; }
 .fa-icon-certificate:before { content: $fa-icon-certificate; }
-.fa-icon-hand-right:before { content: $fa-icon-hand-right; }
-.fa-icon-hand-left:before { content: $fa-icon-hand-left; }
-.fa-icon-hand-up:before { content: $fa-icon-hand-up; }
-.fa-icon-hand-down:before { content: $fa-icon-hand-down; }
+.fa-icon-hand-alt-right:before { content: $fa-icon-hand-alt-right; }
+.fa-icon-hand-alt-left:before { content: $fa-icon-hand-alt-left; }
+.fa-icon-hand-alt-up:before { content: $fa-icon-hand-alt-up; }
+.fa-icon-hand-alt-down:before { content: $fa-icon-hand-alt-down; }
 .fa-icon-arrow-circle-left:before { content: $fa-icon-arrow-circle-left; }
 .fa-icon-arrow-circle-right:before { content: $fa-icon-arrow-circle-right; }
 .fa-icon-arrow-circle-up:before { content: $fa-icon-arrow-circle-up; }
@@ -185,10 +186,10 @@
 .fa-icon-cut:before,
 .fa-icon-scissors:before { content: $fa-icon-scissors; }
 .fa-icon-copy:before,
-.fa-icon-files:before { content: $fa-icon-files; }
+.fa-icon-files-alt:before { content: $fa-icon-files-alt; }
 .fa-icon-paperclip:before { content: $fa-icon-paperclip; }
 .fa-icon-save:before,
-.fa-icon-floppy:before { content: $fa-icon-floppy; }
+.fa-icon-floppy-alt:before { content: $fa-icon-floppy-alt; }
 .fa-icon-square:before { content: $fa-icon-square; }
 .fa-icon-reorder:before { content: $fa-icon-reorder; }
 .fa-icon-list-ul:before { content: $fa-icon-list-ul; }
@@ -230,7 +231,7 @@
 .fa-icon-umbrella:before { content: $fa-icon-umbrella; }
 .fa-icon-paste:before,
 .fa-icon-clipboard:before { content: $fa-icon-clipboard; }
-.fa-icon-lightbulb:before { content: $fa-icon-lightbulb; }
+.fa-icon-lightbulb-alt:before { content: $fa-icon-lightbulb-alt; }
 .fa-icon-exchange:before { content: $fa-icon-exchange; }
 .fa-icon-cloud-download:before { content: $fa-icon-cloud-download; }
 .fa-icon-cloud-upload:before { content: $fa-icon-cloud-upload; }
@@ -249,10 +250,10 @@
 .fa-icon-beer:before { content: $fa-icon-beer; }
 .fa-icon-h-square:before { content: $fa-icon-h-square; }
 .fa-icon-plus-square:before { content: $fa-icon-plus-square; }
-.fa-icon-double-angle-left:before { content: $fa-icon-double-angle-left; }
-.fa-icon-double-angle-right:before { content: $fa-icon-double-angle-right; }
-.fa-icon-double-angle-up:before { content: $fa-icon-double-angle-up; }
-.fa-icon-double-angle-down:before { content: $fa-icon-double-angle-down; }
+.fa-icon-angle-double-left:before { content: $fa-icon-angle-double-left; }
+.fa-icon-angle-double-right:before { content: $fa-icon-angle-double-right; }
+.fa-icon-angle-double-up:before { content: $fa-icon-angle-double-up; }
+.fa-icon-angle-double-down:before { content: $fa-icon-angle-double-down; }
 .fa-icon-angle-left:before { content: $fa-icon-angle-left; }
 .fa-icon-angle-right:before { content: $fa-icon-angle-right; }
 .fa-icon-angle-up:before { content: $fa-icon-angle-up; }
@@ -274,11 +275,11 @@
 .fa-icon-folder-open-alt:before { content: $fa-icon-folder-open-alt; }
 .fa-icon-expand-alt:before { content: $fa-icon-expand-alt; }
 .fa-icon-collapse-alt:before { content: $fa-icon-collapse-alt; }
-.fa-icon-smile:before { content: $fa-icon-smile; }
-.fa-icon-frown:before { content: $fa-icon-frown; }
-.fa-icon-meh:before { content: $fa-icon-meh; }
+.fa-icon-smile-alt:before { content: $fa-icon-smile-alt; }
+.fa-icon-frown-alt:before { content: $fa-icon-frown-alt; }
+.fa-icon-meh-alt:before { content: $fa-icon-meh-alt; }
 .fa-icon-gamepad:before { content: $fa-icon-gamepad; }
-.fa-icon-keyboard:before { content: $fa-icon-keyboard; }
+.fa-icon-keyboard-alt:before { content: $fa-icon-keyboard-alt; }
 .fa-icon-flag-alt:before { content: $fa-icon-flag-alt; }
 .fa-icon-flag-checkered:before { content: $fa-icon-flag-checkered; }
 .fa-icon-terminal:before { content: $fa-icon-terminal; }
@@ -301,7 +302,7 @@
 .fa-icon-eraser:before { content: $fa-icon-eraser; }
 .fa-icon-puzzle-piece:before { content: $fa-icon-puzzle-piece; }
 .fa-icon-microphone:before { content: $fa-icon-microphone; }
-.fa-icon-microphone-off:before { content: $fa-icon-microphone-off; }
+.fa-icon-microphone-slash:before { content: $fa-icon-microphone-slash; }
 .fa-icon-shield:before { content: $fa-icon-shield; }
 .fa-icon-calendar-alt:before { content: $fa-icon-calendar-alt; }
 .fa-icon-fire-extinguisher:before { content: $fa-icon-fire-extinguisher; }
@@ -330,9 +331,12 @@
 .fa-icon-external-link-square:before { content: $fa-icon-external-link-square; }
 .fa-icon-share-square:before { content: $fa-icon-share-square; }
 .fa-icon-compass:before { content: $fa-icon-compass; }
-.fa-icon-collapse-down:before { content: $fa-icon-collapse-down; }
-.fa-icon-collapse-up:before { content: $fa-icon-collapse-up; }
-.fa-icon-expand:before { content: $fa-icon-expand; }
+.fa-icon-toggle-down:before,
+.fa-icon-caret-square-alt-down:before { content: $fa-icon-caret-square-alt-down; }
+.fa-icon-toggle-up:before,
+.fa-icon-caret-square-alt-up:before { content: $fa-icon-caret-square-alt-up; }
+.fa-icon-toggle-right:before,
+.fa-icon-caret-square-alt-right:before { content: $fa-icon-caret-square-alt-right; }
 .fa-icon-euro:before,
 .fa-icon-eur:before { content: $fa-icon-eur; }
 .fa-icon-gbp:before { content: $fa-icon-gbp; }
@@ -361,10 +365,10 @@
 .fa-icon-sort-numeric-desc:before { content: $fa-icon-sort-numeric-desc; }
 .fa-icon-thumbs-up:before { content: $fa-icon-thumbs-up; }
 .fa-icon-thumbs-down:before { content: $fa-icon-thumbs-down; }
-.fa-icon-youtube-sign:before { content: $fa-icon-youtube-sign; }
+.fa-icon-youtube-square:before { content: $fa-icon-youtube-square; }
 .fa-icon-youtube:before { content: $fa-icon-youtube; }
 .fa-icon-xing:before { content: $fa-icon-xing; }
-.fa-icon-xing-sign:before { content: $fa-icon-xing-sign; }
+.fa-icon-xing-square:before { content: $fa-icon-xing-square; }
 .fa-icon-youtube-play:before { content: $fa-icon-youtube-play; }
 .fa-icon-dropbox:before { content: $fa-icon-dropbox; }
 .fa-icon-stack-overflow:before { content: $fa-icon-stack-overflow; }
@@ -390,8 +394,8 @@
 .fa-icon-female:before { content: $fa-icon-female; }
 .fa-icon-male:before { content: $fa-icon-male; }
 .fa-icon-gittip:before { content: $fa-icon-gittip; }
-.fa-icon-sun:before { content: $fa-icon-sun; }
-.fa-icon-moon:before { content: $fa-icon-moon; }
+.fa-icon-sun-alt:before { content: $fa-icon-sun-alt; }
+.fa-icon-moon-alt:before { content: $fa-icon-moon-alt; }
 .fa-icon-archive:before { content: $fa-icon-archive; }
 .fa-icon-bug:before { content: $fa-icon-bug; }
 .fa-icon-vk:before { content: $fa-icon-vk; }
@@ -399,3 +403,7 @@
 .fa-icon-renren:before { content: $fa-icon-renren; }
 .fa-icon-pagelines:before { content: $fa-icon-pagelines; }
 .fa-icon-stack-exchange:before { content: $fa-icon-stack-exchange; }
+.fa-icon-arrow-circle-alt-right:before { content: $fa-icon-arrow-circle-alt-right; }
+.fa-icon-arrow-circle-alt-left:before { content: $fa-icon-arrow-circle-alt-left; }
+.fa-icon-toggle-left:before,
+.fa-icon-caret-square-alt-left:before { content: $fa-icon-caret-square-alt-left; }

+ 35 - 32
scss/_variables.scss

@@ -12,7 +12,7 @@ $fa-icon-li-width:   (30em / 14);
 
 $fa-icon-glass: "\f000";
 $fa-icon-music: "\f001";
-$fa-icon-search: "\f002";
+$fa-icon-magnifying-glass: "\f002";
 $fa-icon-envelope-alt: "\f003";
 $fa-icon-heart: "\f004";
 $fa-icon-star: "\f005";
@@ -24,15 +24,15 @@ $fa-icon-th: "\f00a";
 $fa-icon-th-list: "\f00b";
 $fa-icon-check: "\f00c";
 $fa-icon-times: "\f00d";
-$fa-icon-zoom-in: "\f00e";
-$fa-icon-zoom-out: "\f010";
+$fa-icon-magnifying-glass-plus: "\f00e";
+$fa-icon-magnifying-glass-minus: "\f010";
 $fa-icon-power-off: "\f011";
 $fa-icon-signal: "\f012";
 $fa-icon-cog: "\f013";
-$fa-icon-trash: "\f014";
+$fa-icon-trash-alt: "\f014";
 $fa-icon-home: "\f015";
 $fa-icon-file-alt: "\f016";
-$fa-icon-time: "\f017";
+$fa-icon-clock-alt: "\f017";
 $fa-icon-road: "\f018";
 $fa-icon-download: "\f019";
 $fa-icon-arrow-circle-alt-down: "\f01a";
@@ -69,7 +69,7 @@ $fa-icon-list: "\f03a";
 $fa-icon-outdent: "\f03b";
 $fa-icon-indent: "\f03c";
 $fa-icon-video-camera: "\f03d";
-$fa-icon-picture: "\f03e";
+$fa-icon-picture-alt: "\f03e";
 $fa-icon-pencil: "\f040";
 $fa-icon-map-marker: "\f041";
 $fa-icon-adjust: "\f042";
@@ -96,7 +96,7 @@ $fa-icon-times-circle: "\f057";
 $fa-icon-check-circle: "\f058";
 $fa-icon-question-circle: "\f059";
 $fa-icon-info-circle: "\f05a";
-$fa-icon-screenshot: "\f05b";
+$fa-icon-crosshairs: "\f05b";
 $fa-icon-times-circle-alt: "\f05c";
 $fa-icon-check-circle-alt: "\f05d";
 $fa-icon-ban: "\f05e";
@@ -115,7 +115,7 @@ $fa-icon-gift: "\f06b";
 $fa-icon-leaf: "\f06c";
 $fa-icon-fire: "\f06d";
 $fa-icon-eye: "\f06e";
-$fa-icon-eye-closed: "\f070";
+$fa-icon-eye-slash: "\f070";
 $fa-icon-exclamation-triangle: "\f071";
 $fa-icon-plane: "\f072";
 $fa-icon-calendar: "\f073";
@@ -130,7 +130,7 @@ $fa-icon-folder: "\f07b";
 $fa-icon-folder-open: "\f07c";
 $fa-icon-resize-vertical: "\f07d";
 $fa-icon-resize-horizontal: "\f07e";
-$fa-icon-bar-chart: "\f080";
+$fa-icon-bar-chart-alt: "\f080";
 $fa-icon-twitter-square: "\f081";
 $fa-icon-facebook-square: "\f082";
 $fa-icon-camera-retro: "\f083";
@@ -164,10 +164,10 @@ $fa-icon-hdd: "\f0a0";
 $fa-icon-bullhorn: "\f0a1";
 $fa-icon-bell: "\f0f3";
 $fa-icon-certificate: "\f0a3";
-$fa-icon-hand-right: "\f0a4";
-$fa-icon-hand-left: "\f0a5";
-$fa-icon-hand-up: "\f0a6";
-$fa-icon-hand-down: "\f0a7";
+$fa-icon-hand-alt-right: "\f0a4";
+$fa-icon-hand-alt-left: "\f0a5";
+$fa-icon-hand-alt-up: "\f0a6";
+$fa-icon-hand-alt-down: "\f0a7";
 $fa-icon-arrow-circle-left: "\f0a8";
 $fa-icon-arrow-circle-right: "\f0a9";
 $fa-icon-arrow-circle-up: "\f0aa";
@@ -183,9 +183,9 @@ $fa-icon-link: "\f0c1";
 $fa-icon-cloud: "\f0c2";
 $fa-icon-flask: "\f0c3";
 $fa-icon-scissors: "\f0c4";
-$fa-icon-files: "\f0c5";
+$fa-icon-files-alt: "\f0c5";
 $fa-icon-paperclip: "\f0c6";
-$fa-icon-floppy: "\f0c7";
+$fa-icon-floppy-alt: "\f0c7";
 $fa-icon-square: "\f0c8";
 $fa-icon-reorder: "\f0c9";
 $fa-icon-list-ul: "\f0ca";
@@ -219,7 +219,7 @@ $fa-icon-bolt: "\f0e7";
 $fa-icon-sitemap: "\f0e8";
 $fa-icon-umbrella: "\f0e9";
 $fa-icon-clipboard: "\f0ea";
-$fa-icon-lightbulb: "\f0eb";
+$fa-icon-lightbulb-alt: "\f0eb";
 $fa-icon-exchange: "\f0ec";
 $fa-icon-cloud-download: "\f0ed";
 $fa-icon-cloud-upload: "\f0ee";
@@ -238,10 +238,10 @@ $fa-icon-fighter-jet: "\f0fb";
 $fa-icon-beer: "\f0fc";
 $fa-icon-h-square: "\f0fd";
 $fa-icon-plus-square: "\f0fe";
-$fa-icon-double-angle-left: "\f100";
-$fa-icon-double-angle-right: "\f101";
-$fa-icon-double-angle-up: "\f102";
-$fa-icon-double-angle-down: "\f103";
+$fa-icon-angle-double-left: "\f100";
+$fa-icon-angle-double-right: "\f101";
+$fa-icon-angle-double-up: "\f102";
+$fa-icon-angle-double-down: "\f103";
 $fa-icon-angle-left: "\f104";
 $fa-icon-angle-right: "\f105";
 $fa-icon-angle-up: "\f106";
@@ -261,11 +261,11 @@ $fa-icon-folder-alt: "\f114";
 $fa-icon-folder-open-alt: "\f115";
 $fa-icon-expand-alt: "\f116";
 $fa-icon-collapse-alt: "\f117";
-$fa-icon-smile: "\f118";
-$fa-icon-frown: "\f119";
-$fa-icon-meh: "\f11a";
+$fa-icon-smile-alt: "\f118";
+$fa-icon-frown-alt: "\f119";
+$fa-icon-meh-alt: "\f11a";
 $fa-icon-gamepad: "\f11b";
-$fa-icon-keyboard: "\f11c";
+$fa-icon-keyboard-alt: "\f11c";
 $fa-icon-flag-alt: "\f11d";
 $fa-icon-flag-checkered: "\f11e";
 $fa-icon-terminal: "\f120";
@@ -285,7 +285,7 @@ $fa-icon-subscript: "\f12c";
 $fa-icon-eraser: "\f12d";
 $fa-icon-puzzle-piece: "\f12e";
 $fa-icon-microphone: "\f130";
-$fa-icon-microphone-off: "\f131";
+$fa-icon-microphone-slash: "\f131";
 $fa-icon-shield: "\f132";
 $fa-icon-calendar-alt: "\f133";
 $fa-icon-fire-extinguisher: "\f134";
@@ -314,9 +314,9 @@ $fa-icon-pencil-square: "\f14b";
 $fa-icon-external-link-square: "\f14c";
 $fa-icon-share-square: "\f14d";
 $fa-icon-compass: "\f14e";
-$fa-icon-collapse-down: "\f150";
-$fa-icon-collapse-up: "\f151";
-$fa-icon-expand: "\f152";
+$fa-icon-caret-square-alt-down: "\f150";
+$fa-icon-caret-square-alt-up: "\f151";
+$fa-icon-caret-square-alt-right: "\f152";
 $fa-icon-eur: "\f153";
 $fa-icon-gbp: "\f154";
 $fa-icon-usd: "\f155";
@@ -335,10 +335,10 @@ $fa-icon-sort-numeric-asc: "\f162";
 $fa-icon-sort-numeric-desc: "\f163";
 $fa-icon-thumbs-up: "\f164";
 $fa-icon-thumbs-down: "\f165";
-$fa-icon-youtube-sign: "\f166";
+$fa-icon-youtube-square: "\f166";
 $fa-icon-youtube: "\f167";
 $fa-icon-xing: "\f168";
-$fa-icon-xing-sign: "\f169";
+$fa-icon-xing-square: "\f169";
 $fa-icon-youtube-play: "\f16a";
 $fa-icon-dropbox: "\f16b";
 $fa-icon-stack-overflow: "\f16c";
@@ -364,8 +364,8 @@ $fa-icon-trello: "\f181";
 $fa-icon-female: "\f182";
 $fa-icon-male: "\f183";
 $fa-icon-gittip: "\f184";
-$fa-icon-sun: "\f185";
-$fa-icon-moon: "\f186";
+$fa-icon-sun-alt: "\f185";
+$fa-icon-moon-alt: "\f186";
 $fa-icon-archive: "\f187";
 $fa-icon-bug: "\f188";
 $fa-icon-vk: "\f189";
@@ -373,4 +373,7 @@ $fa-icon-weibo: "\f18a";
 $fa-icon-renren: "\f18b";
 $fa-icon-pagelines: "\f18c";
 $fa-icon-stack-exchange: "\f18d";
+$fa-icon-arrow-circle-alt-right: "\f18e";
+$fa-icon-arrow-circle-alt-left: "\f190";
+$fa-icon-caret-square-alt-left: "\f191";
 

+ 0 - 2
src/_includes/examples.html

@@ -7,8 +7,6 @@
 {% endcapture %}
 {% include stripe-ad.html %}
 
-{% include examples/new.html %}
-
 {% include examples/inline-icons.html %}
 {% include examples/larger-icons.html %}
 {% include examples/bordered-pulled.html %}

+ 1 - 1
src/_includes/icons/new.html

@@ -1,5 +1,5 @@
 <{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="new">
-  <h2 class="page-header">New Icons in {{ site.fontawesome.minor_version }}</h2>
+  <h2 class="page-header">{{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h2>
   {% if page.navbar_active != "icons" %}
     <div class="margin-botom-large">
       You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.

+ 0 - 0
src/_includes/whats-new.html → src/_includes/new-features.html


+ 69 - 0
src/_includes/new-naming.html

@@ -0,0 +1,69 @@
+<section id="new-naming" class="feature-list">
+  <h2 class="page-header">New Naming Conventions in {{ site.fontawesome.minor_version }}</h2>
+  A desire for better icon naming <strong>consistency</strong> and <strong>predictability</strong> are at the heart of the changes in naming conventions.
+  Once you know the name of the base icon shape, you should be able to predict the name of variants.
+  Here are a few examples.
+
+  <div class="row">
+    <div class="col-md-4 col-sm-6">
+      <h4><i class="fa-icon fa-icon-check"></i>fa-icon-check</h4>
+      <ul class="fa-icon-ul padding-left-sm">
+        <li>
+          <i class="fa-icon fa-icon-check-circle fa-icon-li"></i>
+          fa-icon-check-circle -
+          <code>*-circle</code> means a circle is under the previous modifier.
+        </li>
+        <li>
+          <i class="fa-icon fa-icon-check-circle-alt fa-icon-li"></i>
+          fa-icon-check-circle-alt -
+          <code>*-alt</code> means that the previous modifier is outlined.
+        </li>
+        <li>
+          <i class="fa-icon fa-icon-check-square fa-icon-li"></i>
+          fa-icon-check-square -
+          <code>*-square</code> means a square is under the previous modifier.
+        </li>
+        <li>
+          <i class="fa-icon fa-icon-check-square-alt fa-icon-li"></i>
+          fa-icon-check-square-alt -
+          <code>*-alt</code> means that the previous modifier is outlined.
+        </li>
+      </ul>
+    </div>
+    <div class="col-md-4 col-sm-6">
+      <h4><i class="fa-icon fa-icon-arrow-right"></i>fa-icon-arrow-right</h4>
+      <ul class="fa-icon-ul padding-left-sm">
+        <li>
+          <i class="fa-icon fa-icon-arrow-circle-right fa-icon-li"></i>
+          fa-icon-arrow-circle-right -
+          <code>*-circle</code> means a circle is under the previous modifier.
+          <code>*-right</code> is the directional modifier, which always comes last to keep icons properly grouped
+          alphabetically.
+        </li>
+        <li>
+          <i class="fa-icon fa-icon-arrow-circle-alt-right fa-icon-li"></i>
+          fa-icon-arrow-circle-alt-right -
+          <code>*-alt</code> means that the previous modifier is outlined.
+          <code>*-right</code> is the directional modifier, which always comes last to keep icons properly grouped
+          alphabetically.
+        </li>
+      </ul>
+    </div>
+    <div class="col-md-4 col-sm-6">
+      <h4><i class="fa-icon fa-icon-exclamation"></i>fa-icon-exclamation</h4>
+      <ul class="fa-icon-ul padding-left-sm">
+        <li>
+          <i class="fa-icon fa-icon-exclamation-circle fa-icon-li"></i>
+          fa-icon-exclamation-circle -
+          <code>*-circle</code> means a circle is under the previous modifier.
+        </li>
+        <li>
+          <i class="fa-icon fa-icon-exclamation-triangle fa-icon-li"></i>
+          fa-icon-exclamation-triangle -
+          <code>*-triangle</code> means a triangle is under the previous modifier.
+        </li>
+      </ul>
+    </div>
+  </div>
+
+</section>

二进制
src/assets/font-awesome/fonts/FontAwesome.otf


+ 1 - 0
src/assets/less/site-3.0.0.less

@@ -8,6 +8,7 @@
 @import "site/bootstrap/jumbotron";
 @import "site/bootstrap/code";
 @import "site/bootstrap/wells";
+@import "site/bootstrap/type";
 
 @import "site/layout";
 @import "site/social-buttons";

+ 1 - 1
src/assets/less/site/bootstrap/code.less

@@ -1 +1 @@
-pre { font-size: @font-size-small; }
+pre, code { font-size: @font-size-small; }

+ 1 - 1
src/assets/less/site/bootstrap/jumbotron.less

@@ -14,7 +14,7 @@
     margin: 0 0 15px;
   }
   p {
-    font-family: proxima-nova-sc-osf, "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: @font-family-alt;
     color: mix(@jumbotron-text, @jumbotron-bg, 75%);
     margin-top: 15px;
     margin-bottom: 15px;

+ 3 - 0
src/assets/less/site/bootstrap/type.less

@@ -0,0 +1,3 @@
+.small-caps {
+  font-family: @font-family-alt;
+}

+ 1 - 0
src/assets/less/site/bootstrap/variables.less

@@ -63,6 +63,7 @@
 @jumbotron-border:      mix(@jumbotron-bg, @jumbotron-bg-dark, 75%);
 @jumbotron-text:        #fff;
 
+@font-family-alt:       proxima-nova-sc-osf, "Helvetica Neue", Helvetica, Arial, sans-serif;
 
 
 // BOOTSTRAP OVERRIDES

+ 1 - 0
src/assets/less/site/fontawesome-icon-list.less

@@ -25,6 +25,7 @@
           font-size: 28px;
           vertical-align: -6px;
         }
+        .text-muted { color: mix(@jumbotron-text, @jumbotron-bg, 70%); }
       }
     }
   }

+ 106 - 66
src/icons.yml

@@ -13,10 +13,12 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Search
-    id:         search
+  - name:       Magnifying Glass
+    id:         magnifying-glass
     unicode:    f002
     created:    1.0
+    aliases:
+      - search
     categories:
       - Web Application Icons
 
@@ -97,18 +99,22 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Zoom In
-    id:         zoom-in
+  - name:       Magnifying Glass Plus
+    id:         magnifying-glass-plus
     unicode:    f00e
     created:    1.0
+    alias:
+      - search-plus
     categories:
       - Web Application Icons
 
 
-  - name:       Zoom Out
-    id:         zoom-out
+  - name:       Magnifying Glass Minus
+    id:         magnifying-glass-minus
     unicode:    f010
     created:    1.0
+    alias:
+      - search-minus
     categories:
       - Web Application Icons
 
@@ -135,8 +141,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       trash
-    id:         trash
+  - name:       Trash Alt
+    id:         trash-alt
     unicode:    f014
     created:    1.0
     categories:
@@ -156,8 +162,8 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       time
-    id:         time
+  - name:       Clock Alt
+    id:         clock-alt
     unicode:    f017
     created:    1.0
     categories:
@@ -182,14 +188,14 @@ icons:
     unicode:    f01a
     created:    1.0
     categories:
-      - Web Application Icons
+      - Directional Icons
 
   - name:       Arrow Circle Alt Up
     id:         arrow-circle-alt-up
     unicode:    f01b
     created:    1.0
     categories:
-      - Web Application Icons
+      - Directional Icons
 
   - name:       inbox
     id:         inbox
@@ -421,8 +427,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       picture
-    id:         picture
+  - name:       Picture Alt
+    id:         picture-alt
     unicode:    f03e
     created:    1.0
     categories:
@@ -614,8 +620,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       screenshot
-    id:         screenshot
+  - name:       Crosshairs
+    id:         crosshairs
     unicode:    f05b
     created:    1.0
     categories:
@@ -751,8 +757,8 @@ icons:
       - Web Application Icons
 
 
-  - name:       Eye Closed
-    id:         eye-closed
+  - name:       Eye Slash
+    id:         eye-slash
     unicode:    f070
     created:    1.0
     categories:
@@ -859,8 +865,8 @@ icons:
       - Web Application Icons
 
 
-  - name:       bar-chart
-    id:         bar-chart
+  - name:       Bar Chart Alt
+    id:         bar-chart-alt
     unicode:    f080
     created:    1.0
     categories:
@@ -1103,29 +1109,29 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       hand-right
-    id:         hand-right
+  - name:       Hand Alt Right
+    id:         hand-alt-right
     unicode:    f0a4
     created:    2.0
     categories:
       - Directional Icons
 
-  - name:       hand-left
-    id:         hand-left
+  - name:       Hand Alt Left
+    id:         hand-alt-left
     unicode:    f0a5
     created:    2.0
     categories:
       - Directional Icons
 
-  - name:       hand-up
-    id:         hand-up
+  - name:       Hand Alt Up
+    id:         hand-alt-up
     unicode:    f0a6
     created:    2.0
     categories:
       - Directional Icons
 
-  - name:       hand-down
-    id:         hand-down
+  - name:       Hand Alt Down
+    id:         hand-alt-down
     unicode:    f0a7
     created:    2.0
     categories:
@@ -1242,8 +1248,8 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       Files
-    id:         files
+  - name:       Files Alt
+    id:         files-alt
     unicode:    f0c5
     created:    2.0
     aliases:
@@ -1258,8 +1264,8 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       Floppy
-    id:         floppy
+  - name:       Floppy Alt
+    id:         floppy-alt
     unicode:    f0c7
     created:    2.0
     aliases:
@@ -1518,8 +1524,8 @@ icons:
     categories:
       - Text Editor Icons
 
-  - name:       Lightbulb
-    id:         lightbulb
+  - name:       Lightbulb Alt
+    id:         lightbulb-alt
     unicode:    f0eb
     created:    3.0
     categories:
@@ -1654,29 +1660,29 @@ icons:
       - Web Application Icons
 
 
-  - name:       double-angle-left
-    id:         double-angle-left
+  - name:       Angle Double Left
+    id:         angle-double-left
     unicode:    f100
     created:    3.0
     categories:
       - Directional Icons
 
-  - name:       double-angle-right
-    id:         double-angle-right
+  - name:       Angle Double Right
+    id:         angle-double-right
     unicode:    f101
     created:    3.0
     categories:
       - Directional Icons
 
-  - name:       double-angle-up
-    id:         double-angle-up
+  - name:       Angle Double Up
+    id:         angle-double-up
     unicode:    f102
     created:    3.0
     categories:
       - Directional Icons
 
-  - name:       double-angle-down
-    id:         double-angle-down
+  - name:       Angle Double Down
+    id:         angle-double-down
     unicode:    f103
     created:    3.0
     categories:
@@ -1820,22 +1826,22 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Smile
-    id:         smile
+  - name:       Smile Alt
+    id:         smile-alt
     unicode:    f118
     created:    3.1
     categories:
       - Web Application Icons
 
-  - name:       Frown
-    id:         frown
+  - name:       Frown Alt
+    id:         frown-alt
     unicode:    f119
     created:    3.1
     categories:
       - Web Application Icons
 
-  - name:       Meh.
-    id:         meh
+  - name:       Meh Alt
+    id:         meh-alt
     unicode:    f11a
     created:    3.1
     categories:
@@ -1848,8 +1854,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Keyboard
-    id:         keyboard
+  - name:       Keyboard Alt
+    id:         keyboard-alt
     unicode:    f11c
     created:    3.1
     categories:
@@ -1996,8 +2002,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       microphone-off
-    id:         microphone-off
+  - name:       Microphone Slash
+    id:         microphone-slash
     unicode:    f131
     created:    3.1
     categories:
@@ -2201,26 +2207,35 @@ icons:
       - Web Application Icons
 
 
-  - name:       Collapse Down
-    id:         collapse-down
+  - name:       Caret Square Alt Down
+    id:         caret-square-alt-down
     unicode:    f150
     created:    3.2
+    aliases:
+      - toggle-down
     categories:
       - Web Application Icons
+      - Directional Icons
 
-  - name:       Collapse Up
-    id:         collapse-up
+  - name:       Caret Square Alt Up
+    id:         caret-square-alt-up
     unicode:    f151
     created:    3.2
+    aliases:
+      - toggle-up
     categories:
       - Web Application Icons
+      - Directional Icons
 
-  - name:       Expand
-    id:         expand
+  - name:       Caret Square Alt Right
+    id:         caret-square-alt-right
     unicode:    f152
     created:    3.2
+    aliases:
+      - toggle-right
     categories:
       - Web Application Icons
+      - Directional Icons
 
   - name:       Euro (EUR)
     id:         eur
@@ -2368,8 +2383,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       YouTube Sign
-    id:         youtube-sign
+  - name:       YouTube Square
+    id:         youtube-square
     unicode:    f166
     created:    3.2
     categories:
@@ -2389,8 +2404,8 @@ icons:
     categories:
       - Brand Icons
 
-  - name:       Xing Sign
-    id:         xing-sign
+  - name:       Xing Square
+    id:         xing-square
     unicode:    f169
     created:    3.2
     categories:
@@ -2573,15 +2588,15 @@ icons:
     categories:
       - Brand Icons
 
-  - name:       Sun
-    id:         sun
+  - name:       Sun Alt
+    id:         sun-alt
     unicode:    f185
     created:    3.2
     categories:
       - Web Application Icons
 
-  - name:       Moon
-    id:         moon
+  - name:       Moon Alt
+    id:         moon-alt
     unicode:    f186
     created:    3.2
     categories:
@@ -2636,3 +2651,28 @@ icons:
     created:    4.0
     categories:
       - Brand Icons
+
+  - name:       Arrow Circle Alt Right
+    id:         arrow-circle-alt-right
+    unicode:    f18e
+    created:    4.0
+    categories:
+      - Directional Icons
+
+
+  - name:       Arrow Circle Alt Left
+    id:         arrow-circle-alt-left
+    unicode:    f190
+    created:    4.0
+    categories:
+      - Directional Icons
+
+  - name:       Caret Square Alt Left
+    id:         caret-square-alt-left
+    unicode:    f191
+    created:    4.0
+    aliases:
+      - toggle-left
+    categories:
+      - Web Application Icons
+      - Directional Icons

+ 2 - 2
src/whats-new.html

@@ -11,7 +11,7 @@ relative_path: ../
 {% include stripe-social.html %}
 
 <div class="container">
-  {% include whats-new.html %}
-  {% include examples/new.html %}
+  {% include new-features.html %}
+  {% include new-naming.html %}
   {% include icons/new.html %}
 </div>