2
0
Эх сурвалжийг харах

Adding a few official logos, 5 battery states, 2 cursors, group and ungroup.

Dave Gandy 10 жил өмнө
parent
commit
26dbd6f079

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 #[Font Awesome v4.4.0](http://fontawesome.io)
 ###The iconic font and CSS framework
 
-Font Awesome is a full suite of 519 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 532 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 Stay up to date with the latest release and announcements on Twitter:
 [@fontawesome](http://twitter.com/fontawesome).

BIN
fonts/FontAwesome.otf


+ 21 - 0
less/icons.less

@@ -493,6 +493,8 @@
 .@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
 .@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; }
 .@{fa-css-prefix}-git:before { content: @fa-var-git; }
+.@{fa-css-prefix}-y-combinator-square:before,
+.@{fa-css-prefix}-yc-square:before,
 .@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; }
 .@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; }
 .@{fa-css-prefix}-qq:before { content: @fa-var-qq; }
@@ -596,3 +598,22 @@
 .@{fa-css-prefix}-train:before { content: @fa-var-train; }
 .@{fa-css-prefix}-subway:before { content: @fa-var-subway; }
 .@{fa-css-prefix}-medium:before { content: @fa-var-medium; }
+.@{fa-css-prefix}-yc:before,
+.@{fa-css-prefix}-y-combinator:before { content: @fa-var-y-combinator; }
+.@{fa-css-prefix}-optin-monster:before { content: @fa-var-optin-monster; }
+.@{fa-css-prefix}-opencart:before { content: @fa-var-opencart; }
+.@{fa-css-prefix}-expeditedssl:before { content: @fa-var-expeditedssl; }
+.@{fa-css-prefix}-battery-4:before,
+.@{fa-css-prefix}-battery-full:before { content: @fa-var-battery-full; }
+.@{fa-css-prefix}-battery-3:before,
+.@{fa-css-prefix}-battery-three-quarters:before { content: @fa-var-battery-three-quarters; }
+.@{fa-css-prefix}-battery-2:before,
+.@{fa-css-prefix}-battery-half:before { content: @fa-var-battery-half; }
+.@{fa-css-prefix}-battery-1:before,
+.@{fa-css-prefix}-battery-quarter:before { content: @fa-var-battery-quarter; }
+.@{fa-css-prefix}-battery-0:before,
+.@{fa-css-prefix}-battery-empty:before { content: @fa-var-battery-empty; }
+.@{fa-css-prefix}-mouse-pointer:before { content: @fa-var-mouse-pointer; }
+.@{fa-css-prefix}-i-cursor:before { content: @fa-var-i-cursor; }
+.@{fa-css-prefix}-object-group:before { content: @fa-var-object-group; }
+.@{fa-css-prefix}-object-ungroup:before { content: @fa-var-object-ungroup; }

+ 6 - 6
less/path.less

@@ -4,12 +4,12 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
-    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
-    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
-    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
-    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+//    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+//    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+//    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+//    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }

+ 21 - 0
less/variables.less

@@ -58,6 +58,16 @@
 @fa-var-bar-chart-o: "\f080";
 @fa-var-barcode: "\f02a";
 @fa-var-bars: "\f0c9";
+@fa-var-battery-0: "\f244";
+@fa-var-battery-1: "\f243";
+@fa-var-battery-2: "\f242";
+@fa-var-battery-3: "\f241";
+@fa-var-battery-4: "\f240";
+@fa-var-battery-empty: "\f244";
+@fa-var-battery-full: "\f240";
+@fa-var-battery-half: "\f242";
+@fa-var-battery-quarter: "\f243";
+@fa-var-battery-three-quarters: "\f241";
 @fa-var-bed: "\f236";
 @fa-var-beer: "\f0fc";
 @fa-var-behance: "\f1b4";
@@ -194,6 +204,7 @@
 @fa-var-exclamation-circle: "\f06a";
 @fa-var-exclamation-triangle: "\f071";
 @fa-var-expand: "\f065";
+@fa-var-expeditedssl: "\f23e";
 @fa-var-external-link: "\f08e";
 @fa-var-external-link-square: "\f14c";
 @fa-var-eye: "\f06e";
@@ -289,6 +300,7 @@
 @fa-var-hospital-o: "\f0f8";
 @fa-var-hotel: "\f236";
 @fa-var-html5: "\f13b";
+@fa-var-i-cursor: "\f246";
 @fa-var-ils: "\f20b";
 @fa-var-image: "\f03e";
 @fa-var-inbox: "\f01c";
@@ -367,11 +379,16 @@
 @fa-var-moon-o: "\f186";
 @fa-var-mortar-board: "\f19d";
 @fa-var-motorcycle: "\f21c";
+@fa-var-mouse-pointer: "\f245";
 @fa-var-music: "\f001";
 @fa-var-navicon: "\f0c9";
 @fa-var-neuter: "\f22c";
 @fa-var-newspaper-o: "\f1ea";
+@fa-var-object-group: "\f247";
+@fa-var-object-ungroup: "\f248";
+@fa-var-opencart: "\f23d";
 @fa-var-openid: "\f19b";
+@fa-var-optin-monster: "\f23c";
 @fa-var-outdent: "\f03b";
 @fa-var-pagelines: "\f18c";
 @fa-var-paint-brush: "\f1fc";
@@ -600,7 +617,11 @@
 @fa-var-wrench: "\f0ad";
 @fa-var-xing: "\f168";
 @fa-var-xing-square: "\f169";
+@fa-var-y-combinator: "\f23b";
+@fa-var-y-combinator-square: "\f1d4";
 @fa-var-yahoo: "\f19e";
+@fa-var-yc: "\f23b";
+@fa-var-yc-square: "\f1d4";
 @fa-var-yelp: "\f1e9";
 @fa-var-yen: "\f157";
 @fa-var-youtube: "\f167";

+ 21 - 0
scss/_icons.scss

@@ -493,6 +493,8 @@
 .#{$fa-css-prefix}-empire:before { content: $fa-var-empire; }
 .#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; }
 .#{$fa-css-prefix}-git:before { content: $fa-var-git; }
+.#{$fa-css-prefix}-y-combinator-square:before,
+.#{$fa-css-prefix}-yc-square:before,
 .#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; }
 .#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; }
 .#{$fa-css-prefix}-qq:before { content: $fa-var-qq; }
@@ -596,3 +598,22 @@
 .#{$fa-css-prefix}-train:before { content: $fa-var-train; }
 .#{$fa-css-prefix}-subway:before { content: $fa-var-subway; }
 .#{$fa-css-prefix}-medium:before { content: $fa-var-medium; }
+.#{$fa-css-prefix}-yc:before,
+.#{$fa-css-prefix}-y-combinator:before { content: $fa-var-y-combinator; }
+.#{$fa-css-prefix}-optin-monster:before { content: $fa-var-optin-monster; }
+.#{$fa-css-prefix}-opencart:before { content: $fa-var-opencart; }
+.#{$fa-css-prefix}-expeditedssl:before { content: $fa-var-expeditedssl; }
+.#{$fa-css-prefix}-battery-4:before,
+.#{$fa-css-prefix}-battery-full:before { content: $fa-var-battery-full; }
+.#{$fa-css-prefix}-battery-3:before,
+.#{$fa-css-prefix}-battery-three-quarters:before { content: $fa-var-battery-three-quarters; }
+.#{$fa-css-prefix}-battery-2:before,
+.#{$fa-css-prefix}-battery-half:before { content: $fa-var-battery-half; }
+.#{$fa-css-prefix}-battery-1:before,
+.#{$fa-css-prefix}-battery-quarter:before { content: $fa-var-battery-quarter; }
+.#{$fa-css-prefix}-battery-0:before,
+.#{$fa-css-prefix}-battery-empty:before { content: $fa-var-battery-empty; }
+.#{$fa-css-prefix}-mouse-pointer:before { content: $fa-var-mouse-pointer; }
+.#{$fa-css-prefix}-i-cursor:before { content: $fa-var-i-cursor; }
+.#{$fa-css-prefix}-object-group:before { content: $fa-var-object-group; }
+.#{$fa-css-prefix}-object-ungroup:before { content: $fa-var-object-ungroup; }

+ 21 - 0
scss/_variables.scss

@@ -58,6 +58,16 @@ $fa-var-bar-chart: "\f080";
 $fa-var-bar-chart-o: "\f080";
 $fa-var-barcode: "\f02a";
 $fa-var-bars: "\f0c9";
+$fa-var-battery-0: "\f244";
+$fa-var-battery-1: "\f243";
+$fa-var-battery-2: "\f242";
+$fa-var-battery-3: "\f241";
+$fa-var-battery-4: "\f240";
+$fa-var-battery-empty: "\f244";
+$fa-var-battery-full: "\f240";
+$fa-var-battery-half: "\f242";
+$fa-var-battery-quarter: "\f243";
+$fa-var-battery-three-quarters: "\f241";
 $fa-var-bed: "\f236";
 $fa-var-beer: "\f0fc";
 $fa-var-behance: "\f1b4";
@@ -194,6 +204,7 @@ $fa-var-exclamation: "\f12a";
 $fa-var-exclamation-circle: "\f06a";
 $fa-var-exclamation-triangle: "\f071";
 $fa-var-expand: "\f065";
+$fa-var-expeditedssl: "\f23e";
 $fa-var-external-link: "\f08e";
 $fa-var-external-link-square: "\f14c";
 $fa-var-eye: "\f06e";
@@ -289,6 +300,7 @@ $fa-var-home: "\f015";
 $fa-var-hospital-o: "\f0f8";
 $fa-var-hotel: "\f236";
 $fa-var-html5: "\f13b";
+$fa-var-i-cursor: "\f246";
 $fa-var-ils: "\f20b";
 $fa-var-image: "\f03e";
 $fa-var-inbox: "\f01c";
@@ -367,11 +379,16 @@ $fa-var-money: "\f0d6";
 $fa-var-moon-o: "\f186";
 $fa-var-mortar-board: "\f19d";
 $fa-var-motorcycle: "\f21c";
+$fa-var-mouse-pointer: "\f245";
 $fa-var-music: "\f001";
 $fa-var-navicon: "\f0c9";
 $fa-var-neuter: "\f22c";
 $fa-var-newspaper-o: "\f1ea";
+$fa-var-object-group: "\f247";
+$fa-var-object-ungroup: "\f248";
+$fa-var-opencart: "\f23d";
 $fa-var-openid: "\f19b";
+$fa-var-optin-monster: "\f23c";
 $fa-var-outdent: "\f03b";
 $fa-var-pagelines: "\f18c";
 $fa-var-paint-brush: "\f1fc";
@@ -600,7 +617,11 @@ $fa-var-wordpress: "\f19a";
 $fa-var-wrench: "\f0ad";
 $fa-var-xing: "\f168";
 $fa-var-xing-square: "\f169";
+$fa-var-y-combinator: "\f23b";
+$fa-var-y-combinator-square: "\f1d4";
 $fa-var-yahoo: "\f19e";
+$fa-var-yc: "\f23b";
+$fa-var-yc-square: "\f1d4";
 $fa-var-yelp: "\f1e9";
 $fa-var-yen: "\f157";
 $fa-var-youtube: "\f167";

BIN
src/assets/font-awesome/fonts/FontAwesome.otf


+ 6 - 6
src/assets/font-awesome/less/path.less

@@ -4,12 +4,12 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
-  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
-    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
-    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
-    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
-    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
-//  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+//    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+//    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+//    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+//    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+  src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }

+ 109 - 0
src/icons.yml

@@ -4348,6 +4348,9 @@ icons:
     id:         hacker-news
     unicode:    f1d4
     created:    4.1
+    aliases:
+      - y-combinator-square
+      - yc-square
     categories:
       - Brand Icons
 
@@ -5091,3 +5094,109 @@ icons:
     created:    4.3
     categories:
       - Brand Icons
+
+  - name:       Y Combinator
+    id:         y-combinator
+    unicode:    f23b
+    created:    4.4
+    aliases:
+      - yc
+    categories:
+      - Brand Icons
+
+  - name:       Optin Monster
+    id:         optin-monster
+    unicode:    f23c
+    created:    4.4
+    url:        optinmonster.com
+    categories:
+      - Brand Icons
+
+  - name:       OpenCart
+    id:         opencart
+    unicode:    f23d
+    created:    4.4
+    url:        opencart.com
+    categories:
+      - Brand Icons
+
+  - name:       ExpeditedSSL
+    id:         expeditedssl
+    unicode:    f23e
+    created:    4.4
+    categories:
+      - Brand Icons
+
+
+  - name:       Battery Full
+    id:         battery-full
+    unicode:    f240
+    created:    4.4
+    aliases:
+      - battery-4
+    categories:
+      - Web Application Icons
+
+  - name:       Battery 3/4 Full
+    id:         battery-three-quarters
+    unicode:    f241
+    created:    4.4
+    aliases:
+      - battery-3
+    categories:
+      - Web Application Icons
+
+  - name:       Battery 1/2 Full
+    id:         battery-half
+    unicode:    f242
+    created:    4.4
+    aliases:
+      - battery-2
+    categories:
+      - Web Application Icons
+
+  - name:       Battery 1/4 Full
+    id:         battery-quarter
+    unicode:    f243
+    created:    4.4
+    aliases:
+      - battery-1
+    categories:
+      - Web Application Icons
+
+  - name:       Battery Empty
+    id:         battery-empty
+    unicode:    f244
+    created:    4.4
+    aliases:
+      - battery-0
+    categories:
+      - Web Application Icons
+
+  - name:       Mouse Pointer
+    id:         mouse-pointer
+    unicode:    f245
+    created:    4.4
+    categories:
+      - Web Application Icons
+
+  - name:       I Beam Cursor
+    id:         i-cursor
+    unicode:    f246
+    created:    4.4
+    categories:
+      - Web Application Icons
+
+  - name:       Object Group
+    id:         object-group
+    unicode:    f247
+    created:    4.4
+    categories:
+      - Web Application Icons
+
+  - name:       Object Ungroup
+    id:         object-ungroup
+    unicode:    f248
+    created:    4.4
+    categories:
+      - Web Application Icons