Skip to content

Commit

Permalink
Adding fa-first-order, aliasing fa-resistance #9116
Browse files Browse the repository at this point in the history
  • Loading branch information
davegandy committed May 4, 2016
1 parent 9f911aa commit eaac03f
Showing 10 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [Font Awesome v4.6.2](http://fontawesome.io)
### The iconic font and CSS framework

Font Awesome is a full suite of 629 pictographic icons for easy scalable vector graphics on websites,
Font Awesome is a full suite of 630 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).
4 changes: 4 additions & 0 deletions css/font-awesome.css
Original file line number Diff line number Diff line change
@@ -1508,6 +1508,7 @@
content: "\f1ce";
}
.fa-ra:before,
.fa-resistance:before,
.fa-rebel:before {
content: "\f1d0";
}
@@ -2159,6 +2160,9 @@
.fa-pied-piper:before {
content: "\f2ae";
}
.fa-first-order:before {
content: "\f2b0";
}
.sr-only {
position: absolute;
width: 1px;
2 changes: 1 addition & 1 deletion css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file modified fonts/FontAwesome.otf
Binary file not shown.
2 changes: 2 additions & 0 deletions less/icons.less
Original file line number Diff line number Diff line change
@@ -488,6 +488,7 @@
.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
.@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
.@{fa-css-prefix}-ra:before,
.@{fa-css-prefix}-resistance:before,
.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
.@{fa-css-prefix}-ge:before,
.@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
@@ -723,3 +724,4 @@
.@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
.@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
.@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
2 changes: 2 additions & 0 deletions less/variables.less
Original file line number Diff line number Diff line change
@@ -274,6 +274,7 @@
@fa-var-fire: "\f06d";
@fa-var-fire-extinguisher: "\f134";
@fa-var-firefox: "\f269";
@fa-var-first-order: "\f2b0";
@fa-var-flag: "\f024";
@fa-var-flag-checkered: "\f11e";
@fa-var-flag-o: "\f11d";
@@ -523,6 +524,7 @@
@fa-var-repeat: "\f01e";
@fa-var-reply: "\f112";
@fa-var-reply-all: "\f122";
@fa-var-resistance: "\f1d0";
@fa-var-retweet: "\f079";
@fa-var-rmb: "\f157";
@fa-var-road: "\f018";
2 changes: 2 additions & 0 deletions scss/_icons.scss
Original file line number Diff line number Diff line change
@@ -488,6 +488,7 @@
.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; }
.#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; }
.#{$fa-css-prefix}-ra:before,
.#{$fa-css-prefix}-resistance:before,
.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; }
.#{$fa-css-prefix}-ge:before,
.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; }
@@ -723,3 +724,4 @@
.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; }
.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }
.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; }
.#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; }
2 changes: 2 additions & 0 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -274,6 +274,7 @@ $fa-var-filter: "\f0b0";
$fa-var-fire: "\f06d";
$fa-var-fire-extinguisher: "\f134";
$fa-var-firefox: "\f269";
$fa-var-first-order: "\f2b0";
$fa-var-flag: "\f024";
$fa-var-flag-checkered: "\f11e";
$fa-var-flag-o: "\f11d";
@@ -523,6 +524,7 @@ $fa-var-reorder: "\f0c9";
$fa-var-repeat: "\f01e";
$fa-var-reply: "\f112";
$fa-var-reply-all: "\f122";
$fa-var-resistance: "\f1d0";
$fa-var-retweet: "\f079";
$fa-var-rmb: "\f157";
$fa-var-road: "\f018";
Binary file modified src/assets/font-awesome/fonts/FontAwesome.otf
Binary file not shown.
9 changes: 9 additions & 0 deletions src/icons.yml
Original file line number Diff line number Diff line change
@@ -4439,6 +4439,7 @@ icons:
created: 4.1
aliases:
- ra
- resistance
categories:
- Brand Icons

@@ -6136,3 +6137,11 @@ icons:
created: 4.6
categories:
- Brand Icons


- name: First Order
id: first-order
unicode: f2b0
created: 4.6
categories:
- Brand Icons

0 comments on commit eaac03f

Please sign in to comment.