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

Addressing #1530, #8905, #614, #2746, starting on #8895

Browse Source
This commit is contained in:
Dave Gandy 2016-04-06 11:45:20 -05:00
parent 9496b600a8
commit 8f39dab259
16 changed files with 126 additions and 19 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.6.0](http://fontawesome.io)
### The iconic font and CSS framework
Font Awesome is a full suite of 605 pictographic icons for easy scalable vector graphics on websites,
Font Awesome is a full suite of 611 pictographic icons for easy scalable vector graphics on websites,
created and maintained by [Dave Gandy](https://twitter.com/davegandy).
Stay up to date with the latest release and announcements on Twitter:
[@fontawesome](http://twitter.com/fontawesome).

21
css/font-awesome.css vendored
View File

@ -6,8 +6,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.6.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.0#fontawesomeregular') format('svg');
src: url('../fonts/FontAwesome.otf') format('opentype');
font-weight: normal;
font-style: normal;
}
@ -2084,6 +2083,24 @@
.fa-percent:before {
content: "\f295";
}
.fa-gitlab:before {
content: "\f296";
}
.fa-wpbeginner:before {
content: "\f297";
}
.fa-wpforms:before {
content: "\f298";
}
.fa-envira:before {
content: "\f299";
}
.fa-universal-access:before {
content: "\f29a";
}
.fa-wheelchair-alt:before {
content: "\f29b";
}
.sr-only {
position: absolute;
width: 1px;

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.

6
less/icons.less
View File

@ -695,3 +695,9 @@
.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }
.@{fa-css-prefix}-gitlab:before { content: @fa-var-gitlab; }
.@{fa-css-prefix}-wpbeginner:before { content: @fa-var-wpbeginner; }
.@{fa-css-prefix}-wpforms:before { content: @fa-var-wpforms; }
.@{fa-css-prefix}-envira:before { content: @fa-var-envira; }
.@{fa-css-prefix}-universal-access:before { content: @fa-var-universal-access; }
.@{fa-css-prefix}-wheelchair-alt:before { content: @fa-var-wheelchair-alt; }

14
less/path.less
View File

@ -3,13 +3,13 @@
@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?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
font-weight: normal;
font-style: normal;
}

6
less/variables.less
View File

@ -217,6 +217,7 @@
@fa-var-envelope: "\f0e0";
@fa-var-envelope-o: "\f003";
@fa-var-envelope-square: "\f199";
@fa-var-envira: "\f299";
@fa-var-eraser: "\f12d";
@fa-var-eur: "\f153";
@fa-var-euro: "\f153";
@ -300,6 +301,7 @@
@fa-var-github: "\f09b";
@fa-var-github-alt: "\f113";
@fa-var-github-square: "\f092";
@fa-var-gitlab: "\f296";
@fa-var-gittip: "\f184";
@fa-var-glass: "\f000";
@fa-var-globe: "\f0ac";
@ -655,6 +657,7 @@
@fa-var-umbrella: "\f0e9";
@fa-var-underline: "\f0cd";
@fa-var-undo: "\f0e2";
@fa-var-universal-access: "\f29a";
@fa-var-university: "\f19c";
@fa-var-unlink: "\f127";
@fa-var-unlock: "\f09c";
@ -687,11 +690,14 @@
@fa-var-weixin: "\f1d7";
@fa-var-whatsapp: "\f232";
@fa-var-wheelchair: "\f193";
@fa-var-wheelchair-alt: "\f29b";
@fa-var-wifi: "\f1eb";
@fa-var-wikipedia-w: "\f266";
@fa-var-windows: "\f17a";
@fa-var-won: "\f159";
@fa-var-wordpress: "\f19a";
@fa-var-wpbeginner: "\f297";
@fa-var-wpforms: "\f298";
@fa-var-wrench: "\f0ad";
@fa-var-xing: "\f168";
@fa-var-xing-square: "\f169";

6
scss/_icons.scss
View File

@ -695,3 +695,9 @@
.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; }
.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; }
.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; }
.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; }
.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; }
.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; }
.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; }
.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; }
.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; }

6
scss/_variables.scss
View File

@ -217,6 +217,7 @@ $fa-var-empire: "\f1d1";
$fa-var-envelope: "\f0e0";
$fa-var-envelope-o: "\f003";
$fa-var-envelope-square: "\f199";
$fa-var-envira: "\f299";
$fa-var-eraser: "\f12d";
$fa-var-eur: "\f153";
$fa-var-euro: "\f153";
@ -300,6 +301,7 @@ $fa-var-git-square: "\f1d2";
$fa-var-github: "\f09b";
$fa-var-github-alt: "\f113";
$fa-var-github-square: "\f092";
$fa-var-gitlab: "\f296";
$fa-var-gittip: "\f184";
$fa-var-glass: "\f000";
$fa-var-globe: "\f0ac";
@ -655,6 +657,7 @@ $fa-var-twitter-square: "\f081";
$fa-var-umbrella: "\f0e9";
$fa-var-underline: "\f0cd";
$fa-var-undo: "\f0e2";
$fa-var-universal-access: "\f29a";
$fa-var-university: "\f19c";
$fa-var-unlink: "\f127";
$fa-var-unlock: "\f09c";
@ -687,11 +690,14 @@ $fa-var-weibo: "\f18a";
$fa-var-weixin: "\f1d7";
$fa-var-whatsapp: "\f232";
$fa-var-wheelchair: "\f193";
$fa-var-wheelchair-alt: "\f29b";
$fa-var-wifi: "\f1eb";
$fa-var-wikipedia-w: "\f266";
$fa-var-windows: "\f17a";
$fa-var-won: "\f159";
$fa-var-wordpress: "\f19a";
$fa-var-wpbeginner: "\f297";
$fa-var-wpforms: "\f298";
$fa-var-wrench: "\f0ad";
$fa-var-xing: "\f168";
$fa-var-xing-square: "\f169";

12
src/_includes/icons/accessibility.html Normal file
View File

@ -0,0 +1,12 @@
<section id="accessibility">
<h2 class="page-header">Accessibility Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_currency = icons | expand_aliases | category:"Accessibility Icons" | sort_by:'class' %}
{% for icon in icons_currency %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>
{% endfor %}
</div>
</section>

1
src/_includes/navbar.html
View File

@ -67,6 +67,7 @@
<li class="divider"></li>
<li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-fort-awesome fa-fw" aria-hidden="true"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
<li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa fa-camera-retro fa-fw" aria-hidden="true"></i>&nbsp; Web Application Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#accessibility"><i class="fa fa-universal-access fa-fw" aria-hidden="true"></i>&nbsp; Accessibility Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#hand"><i class="fa fa-hand-spock-o fa-fw" aria-hidden="true"></i>&nbsp; Hand Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#transportation"><i class="fa fa-ship fa-fw" aria-hidden="true"></i>&nbsp; Transportation Icons</a></li>
<li><a href="{{ page.relative_path }}icons/#gender"><i class="fa fa-venus fa-fw" aria-hidden="true"></i>&nbsp; Gender Icons</a></li>

2
src/_layouts/icon.html
View File

@ -44,7 +44,7 @@ relative_path: ../../
fa-{{ alias }}{% unless forloop.last %},{% endunless %}
{% endfor %}
{% endif %}
{% if page.icon.url %}&middot; <a target="_blank" href="http://{{ page.icon.url }}">{{ page.icon.url }}<i class="fa fa-external-link-square margin-left-sm"></i></a>{% endif %}
{% if page.icon.url %}&middot; <a target="_blank" rel="nofollow" href="http://{{ page.icon.url }}">{{ page.icon.url }}<i class="fa fa-external-link-square margin-left-sm"></i></a>{% endif %}
</small>
</h1>
</div>

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

Binary file not shown.

14
src/assets/font-awesome/less/path.less vendored
View File

@ -3,13 +3,13 @@
@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?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
font-weight: normal;
font-style: normal;
}

1
src/icons.html
View File

@ -40,6 +40,7 @@ relative_path: ../
<div id="icons">
{% include icons/new.html %}
{% include icons/web-application.html %}
{% include icons/accessibility.html %}
{% include icons/hand.html %}
{% include icons/transportation.html %}
{% include icons/gender.html %}

52
src/icons.yml
View File

@ -1517,6 +1517,7 @@ icons:
id: github-square
unicode: f092
created: 1.0
url: github.com/logos
filter:
- octocat
categories:
@ -1610,6 +1611,7 @@ icons:
id: github
unicode: f09b
created: 2.0
url: github.com/logos
filter:
- octocat
categories:
@ -2729,6 +2731,7 @@ icons:
id: github-alt
unicode: f113
created: 3.0
url: github.com/logos
filter:
- octocat
categories:
@ -5849,3 +5852,52 @@ icons:
created: 4.5
categories:
- Web Application Icons
- name: GitLab
id: gitlab
unicode: f296
created: 4.6
url: gitlab.com
categories:
- Brand Icons
- name: WPBeginner
id: wpbeginner
unicode: f297
created: 4.6
url: wpbeginner.com
categories:
- Brand Icons
- name: WPForms
id: wpforms
unicode: f298
created: 4.6
url: wpforms.com
categories:
- Brand Icons
- name: Envira Gallery
id: envira
unicode: f299
created: 4.6
url: enviragallery.com
categories:
- Brand Icons
- name: Universal Access
id: universal-access
unicode: f29a
created: 4.6
categories:
- Web Application Icons
- Accessibility Icons
- name: Wheelchair Alt
id: wheelchair-alt
unicode: f29b
created: 4.6
categories:
- Web Application Icons
- Accessibility Icons