FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-28 22:41:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '4.2.0-wip' of github.com:FortAwesome/Font-Awesome into 4.2.0-wip

Browse Source 
* '4.2.0-wip' of github.com:FortAwesome/Font-Awesome:
  adding slideshare icon #1176
This commit is contained in:
Geremia Taglialatela 2014-08-22 19:38:10 +02:00
commit 4f785dde0c
10 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

3
css/font-awesome.css vendored
View File

@ -1590,3 +1590,6 @@
.fa-plug:before { .fa-plug:before {
content: "\f1e6"; content: "\f1e6";
} }
.fa-slideshare:before {
content: "\f1e7";
}

2
css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
fonts/FontAwesome.otf
View File

Binary file not shown.

1
less/icons.less
View File

@ -511,3 +511,4 @@
.@{fa-css-prefix}-tty:before { content: @fa-var-tty; } .@{fa-css-prefix}-tty:before { content: @fa-var-tty; }
.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; } .@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; }
.@{fa-css-prefix}-plug:before { content: @fa-var-plug; } .@{fa-css-prefix}-plug:before { content: @fa-var-plug; }
.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; }

1
less/variables.less
View File

@ -401,6 +401,7 @@
@fa-var-skype: "\f17e"; @fa-var-skype: "\f17e";
@fa-var-slack: "\f198"; @fa-var-slack: "\f198";
@fa-var-sliders: "\f1de"; @fa-var-sliders: "\f1de";
@fa-var-slideshare: "\f1e7";
@fa-var-smile-o: "\f118"; @fa-var-smile-o: "\f118";
@fa-var-soccer-ball-o: "\f1e3"; @fa-var-soccer-ball-o: "\f1e3";
@fa-var-sort: "\f0dc"; @fa-var-sort: "\f0dc";

1
scss/_icons.scss
View File

@ -511,3 +511,4 @@
.#{$fa-css-prefix}-tty:before { content: $fa-var-tty; } .#{$fa-css-prefix}-tty:before { content: $fa-var-tty; }
.#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; } .#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; }
.#{$fa-css-prefix}-plug:before { content: $fa-var-plug; } .#{$fa-css-prefix}-plug:before { content: $fa-var-plug; }
.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; }

1
scss/_variables.scss
View File

@ -401,6 +401,7 @@ $fa-var-sitemap: "\f0e8";
$fa-var-skype: "\f17e"; $fa-var-skype: "\f17e";
$fa-var-slack: "\f198"; $fa-var-slack: "\f198";
$fa-var-sliders: "\f1de"; $fa-var-sliders: "\f1de";
$fa-var-slideshare: "\f1e7";
$fa-var-smile-o: "\f118"; $fa-var-smile-o: "\f118";
$fa-var-soccer-ball-o: "\f1e3"; $fa-var-soccer-ball-o: "\f1e3";
$fa-var-sort: "\f0dc"; $fa-var-sort: "\f0dc";

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

Binary file not shown.

7
src/icons.yml
View File

@ -3298,3 +3298,10 @@ icons:
created: 4.2 created: 4.2
categories: categories:
- Web Application Icons - Web Application Icons
- name: Slideshare
id: slideshare
unicode: f1e7
created: 4.2
categories:
- Brand Icons