From a2ba7c9ebf16d703cc5402dbbdc8981edad003b7 Mon Sep 17 00:00:00 2001 From: davegandy Date: Mon, 4 Nov 2013 11:17:24 -0500 Subject: [PATCH] finishing off icon renaming, hopefully #2310 --- css/font-awesome.css | 27 +++---- css/font-awesome.min.css | 26 +++---- less/icons.less | 27 +++---- less/variables.less | 26 +++---- scss/_icons.scss | 27 +++---- scss/_variables.scss | 26 +++---- src/_includes/navbar.html | 2 +- src/_includes/new-naming.html | 48 ++++++++++-- src/icons.yml | 54 +++++++------- src/test-2.3.2.html | 134 +++++++++++++++++----------------- src/test.html | 134 +++++++++++++++++----------------- 11 files changed, 286 insertions(+), 245 deletions(-) diff --git a/css/font-awesome.css b/css/font-awesome.css index b884ecd4d..3d0d1777c 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -415,7 +415,7 @@ .fa-check-square-o:before { content: "\f046"; } -.fa-move:before { +.fa-arrows:before { content: "\f047"; } .fa-step-backward:before { @@ -500,10 +500,10 @@ .fa-share:before { content: "\f064"; } -.fa-resize-full:before { +.fa-expand:before { content: "\f065"; } -.fa-resize-small:before { +.fa-compress:before { content: "\f066"; } .fa-plus:before { @@ -570,10 +570,10 @@ .fa-folder-open:before { content: "\f07c"; } -.fa-resize-vertical:before { +.fa-arrows-v:before { content: "\f07d"; } -.fa-resize-horizontal:before { +.fa-arrows-h:before { content: "\f07e"; } .fa-bar-chart-o:before { @@ -718,10 +718,11 @@ .fa-briefcase:before { content: "\f0b1"; } -.fa-fullscreen:before { +.fa-arrows-alt:before { content: "\f0b2"; } -.fa-group:before { +.fa-group:before, +.fa-users:before { content: "\f0c0"; } .fa-chain:before, @@ -752,7 +753,7 @@ .fa-square:before { content: "\f0c8"; } -.fa-reorder:before { +.fa-bars:before { content: "\f0c9"; } .fa-list-ul:before { @@ -889,10 +890,10 @@ .fa-file-text-o:before { content: "\f0f6"; } -.fa-building:before { +.fa-building-o:before { content: "\f0f7"; } -.fa-hospital:before { +.fa-hospital-o:before { content: "\f0f8"; } .fa-ambulance:before { @@ -1092,16 +1093,16 @@ .fa-anchor:before { content: "\f13d"; } -.fa-unlock-o:before { +.fa-unlock-alt:before { content: "\f13e"; } .fa-bullseye:before { content: "\f140"; } -.fa-ellipsis-horizontal:before { +.fa-ellipsis-h:before { content: "\f141"; } -.fa-ellipsis-vertical:before { +.fa-ellipsis-v:before { content: "\f142"; } .fa-rss-square:before { diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index 9b280e77a..500e2736e 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -90,7 +90,7 @@ .fa-edit:before,.fa-pencil-square-o:before{content:"\f044"} .fa-share-square-o:before{content:"\f045"} .fa-check-square-o:before{content:"\f046"} -.fa-move:before{content:"\f047"} +.fa-arrows:before{content:"\f047"} .fa-step-backward:before{content:"\f048"} .fa-fast-backward:before{content:"\f049"} .fa-backward:before{content:"\f04a"} @@ -118,8 +118,8 @@ .fa-arrow-up:before{content:"\f062"} .fa-arrow-down:before{content:"\f063"} .fa-mail-forward:before,.fa-share:before{content:"\f064"} -.fa-resize-full:before{content:"\f065"} -.fa-resize-small:before{content:"\f066"} +.fa-expand:before{content:"\f065"} +.fa-compress:before{content:"\f066"} .fa-plus:before{content:"\f067"} .fa-minus:before{content:"\f068"} .fa-asterisk:before{content:"\f069"} @@ -141,8 +141,8 @@ .fa-shopping-cart:before{content:"\f07a"} .fa-folder:before{content:"\f07b"} .fa-folder-open:before{content:"\f07c"} -.fa-resize-vertical:before{content:"\f07d"} -.fa-resize-horizontal:before{content:"\f07e"} +.fa-arrows-v:before{content:"\f07d"} +.fa-arrows-h:before{content:"\f07e"} .fa-bar-chart-o:before{content:"\f080"} .fa-twitter-square:before{content:"\f081"} .fa-facebook-square:before{content:"\f082"} @@ -190,8 +190,8 @@ .fa-tasks:before{content:"\f0ae"} .fa-filter:before{content:"\f0b0"} .fa-briefcase:before{content:"\f0b1"} -.fa-fullscreen:before{content:"\f0b2"} -.fa-group:before{content:"\f0c0"} +.fa-arrows-alt:before{content:"\f0b2"} +.fa-group:before,.fa-users:before{content:"\f0c0"} .fa-chain:before,.fa-link:before{content:"\f0c1"} .fa-cloud:before{content:"\f0c2"} .fa-flask:before{content:"\f0c3"} @@ -200,7 +200,7 @@ .fa-paperclip:before{content:"\f0c6"} .fa-save:before,.fa-floppy-o:before{content:"\f0c7"} .fa-square:before{content:"\f0c8"} -.fa-reorder:before{content:"\f0c9"} +.fa-bars:before{content:"\f0c9"} .fa-list-ul:before{content:"\f0ca"} .fa-list-ol:before{content:"\f0cb"} .fa-strikethrough:before{content:"\f0cc"} @@ -243,8 +243,8 @@ .fa-coffee:before{content:"\f0f4"} .fa-cutlery:before{content:"\f0f5"} .fa-file-text-o:before{content:"\f0f6"} -.fa-building:before{content:"\f0f7"} -.fa-hospital:before{content:"\f0f8"} +.fa-building-o:before{content:"\f0f7"} +.fa-hospital-o:before{content:"\f0f8"} .fa-ambulance:before{content:"\f0f9"} .fa-medkit:before{content:"\f0fa"} .fa-fighter-jet:before{content:"\f0fb"} @@ -309,10 +309,10 @@ .fa-html5:before{content:"\f13b"} .fa-css3:before{content:"\f13c"} .fa-anchor:before{content:"\f13d"} -.fa-unlock-o:before{content:"\f13e"} +.fa-unlock-alt:before{content:"\f13e"} .fa-bullseye:before{content:"\f140"} -.fa-ellipsis-horizontal:before{content:"\f141"} -.fa-ellipsis-vertical:before{content:"\f142"} +.fa-ellipsis-h:before{content:"\f141"} +.fa-ellipsis-v:before{content:"\f142"} .fa-rss-square:before{content:"\f143"} .fa-play-circle:before{content:"\f144"} .fa-ticket:before{content:"\f145"} diff --git a/less/icons.less b/less/icons.less index 2e13602bb..bf0f856fc 100644 --- a/less/icons.less +++ b/less/icons.less @@ -72,7 +72,7 @@ .@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; } .@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; } .@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; } -.@{fa-css-prefix}-move:before { content: @fa-var-move; } +.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; } .@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; } .@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; } .@{fa-css-prefix}-backward:before { content: @fa-var-backward; } @@ -101,8 +101,8 @@ .@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; } .@{fa-css-prefix}-mail-forward:before, .@{fa-css-prefix}-share:before { content: @fa-var-share; } -.@{fa-css-prefix}-resize-full:before { content: @fa-var-resize-full; } -.@{fa-css-prefix}-resize-small:before { content: @fa-var-resize-small; } +.@{fa-css-prefix}-expand:before { content: @fa-var-expand; } +.@{fa-css-prefix}-compress:before { content: @fa-var-compress; } .@{fa-css-prefix}-plus:before { content: @fa-var-plus; } .@{fa-css-prefix}-minus:before { content: @fa-var-minus; } .@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; } @@ -125,8 +125,8 @@ .@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; } .@{fa-css-prefix}-folder:before { content: @fa-var-folder; } .@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; } -.@{fa-css-prefix}-resize-vertical:before { content: @fa-var-resize-vertical; } -.@{fa-css-prefix}-resize-horizontal:before { content: @fa-var-resize-horizontal; } +.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; } +.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; } .@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; } .@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; } .@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; } @@ -175,8 +175,9 @@ .@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; } .@{fa-css-prefix}-filter:before { content: @fa-var-filter; } .@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; } -.@{fa-css-prefix}-fullscreen:before { content: @fa-var-fullscreen; } -.@{fa-css-prefix}-group:before { content: @fa-var-group; } +.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; } +.@{fa-css-prefix}-group:before, +.@{fa-css-prefix}-users:before { content: @fa-var-users; } .@{fa-css-prefix}-chain:before, .@{fa-css-prefix}-link:before { content: @fa-var-link; } .@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; } @@ -189,7 +190,7 @@ .@{fa-css-prefix}-save:before, .@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; } .@{fa-css-prefix}-square:before { content: @fa-var-square; } -.@{fa-css-prefix}-reorder:before { content: @fa-var-reorder; } +.@{fa-css-prefix}-bars:before { content: @fa-var-bars; } .@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; } .@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; } .@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; } @@ -240,8 +241,8 @@ .@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; } .@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; } .@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; } -.@{fa-css-prefix}-building:before { content: @fa-var-building; } -.@{fa-css-prefix}-hospital:before { content: @fa-var-hospital; } +.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; } +.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; } .@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; } .@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; } .@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; } @@ -311,10 +312,10 @@ .@{fa-css-prefix}-html5:before { content: @fa-var-html5; } .@{fa-css-prefix}-css3:before { content: @fa-var-css3; } .@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; } -.@{fa-css-prefix}-unlock-o:before { content: @fa-var-unlock-o; } +.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; } .@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; } -.@{fa-css-prefix}-ellipsis-horizontal:before { content: @fa-var-ellipsis-horizontal; } -.@{fa-css-prefix}-ellipsis-vertical:before { content: @fa-var-ellipsis-vertical; } +.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; } +.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; } .@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; } .@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; } .@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; } diff --git a/less/variables.less b/less/variables.less index e899a59d6..db875b462 100644 --- a/less/variables.less +++ b/less/variables.less @@ -76,7 +76,7 @@ @fa-var-pencil-square-o: "\f044"; @fa-var-share-square-o: "\f045"; @fa-var-check-square-o: "\f046"; -@fa-var-move: "\f047"; +@fa-var-arrows: "\f047"; @fa-var-step-backward: "\f048"; @fa-var-fast-backward: "\f049"; @fa-var-backward: "\f04a"; @@ -104,8 +104,8 @@ @fa-var-arrow-up: "\f062"; @fa-var-arrow-down: "\f063"; @fa-var-share: "\f064"; -@fa-var-resize-full: "\f065"; -@fa-var-resize-small: "\f066"; +@fa-var-expand: "\f065"; +@fa-var-compress: "\f066"; @fa-var-plus: "\f067"; @fa-var-minus: "\f068"; @fa-var-asterisk: "\f069"; @@ -127,8 +127,8 @@ @fa-var-shopping-cart: "\f07a"; @fa-var-folder: "\f07b"; @fa-var-folder-open: "\f07c"; -@fa-var-resize-vertical: "\f07d"; -@fa-var-resize-horizontal: "\f07e"; +@fa-var-arrows-v: "\f07d"; +@fa-var-arrows-h: "\f07e"; @fa-var-bar-chart-o: "\f080"; @fa-var-twitter-square: "\f081"; @fa-var-facebook-square: "\f082"; @@ -176,8 +176,8 @@ @fa-var-tasks: "\f0ae"; @fa-var-filter: "\f0b0"; @fa-var-briefcase: "\f0b1"; -@fa-var-fullscreen: "\f0b2"; -@fa-var-group: "\f0c0"; +@fa-var-arrows-alt: "\f0b2"; +@fa-var-users: "\f0c0"; @fa-var-link: "\f0c1"; @fa-var-cloud: "\f0c2"; @fa-var-flask: "\f0c3"; @@ -186,7 +186,7 @@ @fa-var-paperclip: "\f0c6"; @fa-var-floppy-o: "\f0c7"; @fa-var-square: "\f0c8"; -@fa-var-reorder: "\f0c9"; +@fa-var-bars: "\f0c9"; @fa-var-list-ul: "\f0ca"; @fa-var-list-ol: "\f0cb"; @fa-var-strikethrough: "\f0cc"; @@ -229,8 +229,8 @@ @fa-var-coffee: "\f0f4"; @fa-var-cutlery: "\f0f5"; @fa-var-file-text-o: "\f0f6"; -@fa-var-building: "\f0f7"; -@fa-var-hospital: "\f0f8"; +@fa-var-building-o: "\f0f7"; +@fa-var-hospital-o: "\f0f8"; @fa-var-ambulance: "\f0f9"; @fa-var-medkit: "\f0fa"; @fa-var-fighter-jet: "\f0fb"; @@ -295,10 +295,10 @@ @fa-var-html5: "\f13b"; @fa-var-css3: "\f13c"; @fa-var-anchor: "\f13d"; -@fa-var-unlock-o: "\f13e"; +@fa-var-unlock-alt: "\f13e"; @fa-var-bullseye: "\f140"; -@fa-var-ellipsis-horizontal: "\f141"; -@fa-var-ellipsis-vertical: "\f142"; +@fa-var-ellipsis-h: "\f141"; +@fa-var-ellipsis-v: "\f142"; @fa-var-rss-square: "\f143"; @fa-var-play-circle: "\f144"; @fa-var-ticket: "\f145"; diff --git a/scss/_icons.scss b/scss/_icons.scss index 38ed7e17c..7490cf361 100644 --- a/scss/_icons.scss +++ b/scss/_icons.scss @@ -72,7 +72,7 @@ .#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; } .#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; } .#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; } -.#{$fa-css-prefix}-move:before { content: $fa-var-move; } +.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; } .#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; } .#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; } .#{$fa-css-prefix}-backward:before { content: $fa-var-backward; } @@ -101,8 +101,8 @@ .#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; } .#{$fa-css-prefix}-mail-forward:before, .#{$fa-css-prefix}-share:before { content: $fa-var-share; } -.#{$fa-css-prefix}-resize-full:before { content: $fa-var-resize-full; } -.#{$fa-css-prefix}-resize-small:before { content: $fa-var-resize-small; } +.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; } +.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; } .#{$fa-css-prefix}-plus:before { content: $fa-var-plus; } .#{$fa-css-prefix}-minus:before { content: $fa-var-minus; } .#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; } @@ -125,8 +125,8 @@ .#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; } .#{$fa-css-prefix}-folder:before { content: $fa-var-folder; } .#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; } -.#{$fa-css-prefix}-resize-vertical:before { content: $fa-var-resize-vertical; } -.#{$fa-css-prefix}-resize-horizontal:before { content: $fa-var-resize-horizontal; } +.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; } +.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; } .#{$fa-css-prefix}-bar-chart-o:before { content: $fa-var-bar-chart-o; } .#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; } .#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; } @@ -175,8 +175,9 @@ .#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; } .#{$fa-css-prefix}-filter:before { content: $fa-var-filter; } .#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; } -.#{$fa-css-prefix}-fullscreen:before { content: $fa-var-fullscreen; } -.#{$fa-css-prefix}-group:before { content: $fa-var-group; } +.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; } +.#{$fa-css-prefix}-group:before, +.#{$fa-css-prefix}-users:before { content: $fa-var-users; } .#{$fa-css-prefix}-chain:before, .#{$fa-css-prefix}-link:before { content: $fa-var-link; } .#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; } @@ -189,7 +190,7 @@ .#{$fa-css-prefix}-save:before, .#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; } .#{$fa-css-prefix}-square:before { content: $fa-var-square; } -.#{$fa-css-prefix}-reorder:before { content: $fa-var-reorder; } +.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; } .#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; } .#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; } .#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; } @@ -240,8 +241,8 @@ .#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; } .#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; } .#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; } -.#{$fa-css-prefix}-building:before { content: $fa-var-building; } -.#{$fa-css-prefix}-hospital:before { content: $fa-var-hospital; } +.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; } +.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; } .#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; } .#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; } .#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; } @@ -311,10 +312,10 @@ .#{$fa-css-prefix}-html5:before { content: $fa-var-html5; } .#{$fa-css-prefix}-css3:before { content: $fa-var-css3; } .#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; } -.#{$fa-css-prefix}-unlock-o:before { content: $fa-var-unlock-o; } +.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; } .#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; } -.#{$fa-css-prefix}-ellipsis-horizontal:before { content: $fa-var-ellipsis-horizontal; } -.#{$fa-css-prefix}-ellipsis-vertical:before { content: $fa-var-ellipsis-vertical; } +.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; } +.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; } .#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; } .#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; } .#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; } diff --git a/scss/_variables.scss b/scss/_variables.scss index b0abeb66e..cd8014009 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -76,7 +76,7 @@ $fa-var-tint: "\f043"; $fa-var-pencil-square-o: "\f044"; $fa-var-share-square-o: "\f045"; $fa-var-check-square-o: "\f046"; -$fa-var-move: "\f047"; +$fa-var-arrows: "\f047"; $fa-var-step-backward: "\f048"; $fa-var-fast-backward: "\f049"; $fa-var-backward: "\f04a"; @@ -104,8 +104,8 @@ $fa-var-arrow-right: "\f061"; $fa-var-arrow-up: "\f062"; $fa-var-arrow-down: "\f063"; $fa-var-share: "\f064"; -$fa-var-resize-full: "\f065"; -$fa-var-resize-small: "\f066"; +$fa-var-expand: "\f065"; +$fa-var-compress: "\f066"; $fa-var-plus: "\f067"; $fa-var-minus: "\f068"; $fa-var-asterisk: "\f069"; @@ -127,8 +127,8 @@ $fa-var-retweet: "\f079"; $fa-var-shopping-cart: "\f07a"; $fa-var-folder: "\f07b"; $fa-var-folder-open: "\f07c"; -$fa-var-resize-vertical: "\f07d"; -$fa-var-resize-horizontal: "\f07e"; +$fa-var-arrows-v: "\f07d"; +$fa-var-arrows-h: "\f07e"; $fa-var-bar-chart-o: "\f080"; $fa-var-twitter-square: "\f081"; $fa-var-facebook-square: "\f082"; @@ -176,8 +176,8 @@ $fa-var-wrench: "\f0ad"; $fa-var-tasks: "\f0ae"; $fa-var-filter: "\f0b0"; $fa-var-briefcase: "\f0b1"; -$fa-var-fullscreen: "\f0b2"; -$fa-var-group: "\f0c0"; +$fa-var-arrows-alt: "\f0b2"; +$fa-var-users: "\f0c0"; $fa-var-link: "\f0c1"; $fa-var-cloud: "\f0c2"; $fa-var-flask: "\f0c3"; @@ -186,7 +186,7 @@ $fa-var-files-o: "\f0c5"; $fa-var-paperclip: "\f0c6"; $fa-var-floppy-o: "\f0c7"; $fa-var-square: "\f0c8"; -$fa-var-reorder: "\f0c9"; +$fa-var-bars: "\f0c9"; $fa-var-list-ul: "\f0ca"; $fa-var-list-ol: "\f0cb"; $fa-var-strikethrough: "\f0cc"; @@ -229,8 +229,8 @@ $fa-var-bell-o: "\f0a2"; $fa-var-coffee: "\f0f4"; $fa-var-cutlery: "\f0f5"; $fa-var-file-text-o: "\f0f6"; -$fa-var-building: "\f0f7"; -$fa-var-hospital: "\f0f8"; +$fa-var-building-o: "\f0f7"; +$fa-var-hospital-o: "\f0f8"; $fa-var-ambulance: "\f0f9"; $fa-var-medkit: "\f0fa"; $fa-var-fighter-jet: "\f0fb"; @@ -295,10 +295,10 @@ $fa-var-chevron-circle-down: "\f13a"; $fa-var-html5: "\f13b"; $fa-var-css3: "\f13c"; $fa-var-anchor: "\f13d"; -$fa-var-unlock-o: "\f13e"; +$fa-var-unlock-alt: "\f13e"; $fa-var-bullseye: "\f140"; -$fa-var-ellipsis-horizontal: "\f141"; -$fa-var-ellipsis-vertical: "\f142"; +$fa-var-ellipsis-h: "\f141"; +$fa-var-ellipsis-v: "\f142"; $fa-var-rss-square: "\f143"; $fa-var-play-circle: "\f144"; $fa-var-ticket: "\f145"; diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html index cc149f341..ae5696f2f 100644 --- a/src/_includes/navbar.html +++ b/src/_includes/navbar.html @@ -3,7 +3,7 @@
Font Awesome
diff --git a/src/_includes/new-naming.html b/src/_includes/new-naming.html index 06317915e..a1d574dbf 100644 --- a/src/_includes/new-naming.html +++ b/src/_includes/new-naming.html @@ -7,7 +7,7 @@ the names of variants.

-
+

fa-*

Solid icons as the base variant

    @@ -25,7 +25,7 @@
-
+

*-o

Outlined version of previous modifier

    @@ -43,7 +43,7 @@
-
+

*-circle

Circle under previous modifier

    @@ -61,7 +61,7 @@
-
+

*-square

Square under previous modifier

    @@ -79,7 +79,7 @@
-
+

*-right, *-up, etc.

Directional modifier always at the end

    @@ -97,7 +97,43 @@
-
+
+

*-alt

+

Alternative to the original

+
    +
  • + + fa-unlock-alt +
    • +
  • + + fa-list-alt +
    • +
  • + + fa-github-alt +
    • +
+
+
+

*-h, *-v

+

Horizontal & vertical modifiers

+
    +
  • + + fa-arrows-v +
    • +
  • + + fa-arrows-h +
    • +
  • + + fa-ellipsis-v +
    • +
+
+

Combine 'em up...

Consistent when strung together

    diff --git a/src/icons.yml b/src/icons.yml index 2ca514c93..45bae0302 100644 --- a/src/icons.yml +++ b/src/icons.yml @@ -481,8 +481,8 @@ icons: - Web Application Icons - Form Control Icons - - name: move - id: move + - name: Arrows + id: arrows unicode: f047 created: 1.0 categories: @@ -681,15 +681,15 @@ icons: categories: - Web Application Icons - - name: resize-full - id: resize-full + - name: Expand + id: expand unicode: f065 created: 1.0 categories: - Video Player Icons - - name: resize-small - id: resize-small + - name: Compress + id: compress unicode: f066 created: 1.0 categories: @@ -845,15 +845,15 @@ icons: categories: - Web Application Icons - - name: resize-vertical - id: resize-vertical + - name: Arrows Vertical + id: arrows-v unicode: f07d created: 1.0 categories: - Web Application Icons - - name: resize-horizontal - id: resize-horizontal + - name: Arrows Horizontal + id: arrows-h unicode: f07e created: 1.0 categories: @@ -1196,18 +1196,20 @@ icons: categories: - Web Application Icons - - name: fullscreen - id: fullscreen + - name: Arrows Alt + id: arrows-alt unicode: f0b2 created: 2.0 categories: - Video Player Icons - - name: Group - id: group + - name: Users + id: users unicode: f0c0 created: 2.0 + aliases: + - group categories: - Web Application Icons @@ -1276,8 +1278,8 @@ icons: - Web Application Icons - Form Control Icons - - name: Reorder - id: reorder + - name: Bars + id: bars unicode: f0c9 created: 2.0 categories: @@ -1598,15 +1600,15 @@ icons: categories: - Text Editor Icons - - name: Building - id: building + - name: Building Outlined + id: building-o unicode: f0f7 created: 3.0 categories: - Web Application Icons - - name: hospital - id: hospital + - name: hospital Outlined + id: hospital-o unicode: f0f8 created: 3.0 categories: @@ -2077,8 +2079,8 @@ icons: categories: - Web Application Icons - - name: Unlock Outlined - id: unlock-o + - name: Unlock Alt + id: unlock-alt unicode: f13e created: 3.1 categories: @@ -2092,15 +2094,15 @@ icons: categories: - Web Application Icons - - name: Horizontal Ellipsis - id: ellipsis-horizontal + - name: Ellipsis Horizontal + id: ellipsis-h unicode: f141 created: 3.1 categories: - Web Application Icons - - name: Vertical Ellipsis - id: ellipsis-vertical + - name: Ellipsis Vertical + id: ellipsis-v unicode: f142 created: 3.1 categories: diff --git a/src/test-2.3.2.html b/src/test-2.3.2.html index 764f99cc7..ea75a5d0b 100644 --- a/src/test-2.3.2.html +++ b/src/test-2.3.2.html @@ -57,34 +57,34 @@ relative_path: ../
    - Building + Building
    - Building Large + Building Large
    - Building + Building
    - Building Large + Building Large
    - Building + Building
    - Building Large + Building Large
    - Building Large + Building Large
    @@ -125,10 +125,10 @@ relative_path: ../

    Links with Icons icon should activate link & NOT underline

    - Link Here + Link Here
    - Link Here + Link Here
    Link Here @@ -145,10 +145,10 @@ relative_path: ../
    - Link Here + Link Here
    - Link Here + Link Here
    Link Here @@ -178,11 +178,11 @@ relative_path: ../ -
  • Nav Item 3
    • +
  • Nav Item 3
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
    • @@ -199,23 +199,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -223,23 +223,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -302,23 +302,23 @@ relative_path: ../
    @@ -326,23 +326,23 @@ relative_path: ../
    @@ -481,8 +481,8 @@ relative_path: ../
  • @@ -491,11 +491,11 @@ relative_path: ../
    • -
  • Nav Item 4
    • +
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
  • Nav Item 7
    • @@ -508,8 +508,8 @@ relative_path: ../
  • @@ -518,11 +518,11 @@ relative_path: ../
    • -
  • Nav Item 4
    • +
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
  • Nav Item 7
    • @@ -575,7 +575,7 @@ relative_path: ../
- + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
@@ -596,8 +596,8 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    • -
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - +
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. + foo foo
    • @@ -609,8 +609,8 @@ relative_path: ../
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
      • -
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - +
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. + foo foo
      • @@ -624,7 +624,7 @@ relative_path: ../
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
        • -
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
        • +
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -633,7 +633,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    • -
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    • +
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -644,7 +644,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    • -
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    • +
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -653,7 +653,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    • -
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    • +
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -665,7 +665,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + foo foo
    • @@ -678,7 +678,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + foo foo
    • diff --git a/src/test.html b/src/test.html index 836bd1c03..0384f8a77 100644 --- a/src/test.html +++ b/src/test.html @@ -11,34 +11,34 @@ relative_path: ../
    - Building + Building
    - Building Large + Building Large
    - Building + Building
    - Building Large + Building Large
    - Building + Building
    - Building Large + Building Large
    - Building Large + Building Large
    @@ -79,10 +79,10 @@ relative_path: ../

    Links with Icons icon should activate link & NOT underline

    - Link Here + Link Here
    - Link Here + Link Here
    Link Here @@ -99,10 +99,10 @@ relative_path: ../
    - Link Here + Link Here
    - Link Here + Link Here
    Link Here @@ -131,11 +131,11 @@ relative_path: ../ -
  • Nav Item 3
    • +
  • Nav Item 3
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
    • @@ -151,23 +151,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -175,23 +175,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -254,23 +254,23 @@ relative_path: ../
    @@ -278,23 +278,23 @@ relative_path: ../
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    @@ -433,8 +433,8 @@ relative_path: ../
  • @@ -443,11 +443,11 @@ relative_path: ../
    • -
  • Nav Item 4
    • +
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
  • Nav Item 7
    • @@ -460,8 +460,8 @@ relative_path: ../
  • @@ -470,11 +470,11 @@ relative_path: ../
    • -
  • Nav Item 4
    • +
  • Nav Item 4
  • Nav Item 5
  • Nav Item 6
  • Nav Item 7
    • @@ -522,7 +522,7 @@ relative_path: ../
    - + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
    @@ -543,8 +543,8 @@ relative_path: ../
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
      • -
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - +
    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. + foo foo
      • @@ -556,8 +556,8 @@ relative_path: ../
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
        • -
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - +
      • Lorem ipsum dolor sit amet, consectetur adipiscing elit. + foo foo
        • @@ -571,7 +571,7 @@ relative_path: ../
        • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
        • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
          • -
        • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
          • +
        • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    @@ -580,7 +580,7 @@ relative_path: ../ @@ -591,7 +591,7 @@ relative_path: ../ @@ -600,7 +600,7 @@ relative_path: ../ @@ -612,7 +612,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + foo foo
    • @@ -625,7 +625,7 @@ relative_path: ../
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam et lectus id nisl hendrerit varius. Aliquam erat volutpat. Suspendisse potenti. Aliquam erat volutpat. Aliquam ut dolor lectus.
  • Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + foo foo