Browse Source

updating language in adblock plus warning

Dave Gandy 11 years ago
parent
commit
fcdf450868

+ 8 - 0
css/font-awesome.css

@@ -1502,3 +1502,11 @@
 .fa-circle-o-notch:before {
 .fa-circle-o-notch:before {
   content: "\f1ce";
   content: "\f1ce";
 }
 }
+.fa-ra:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}

+ 8 - 0
css/font-awesome.min.css

@@ -1502,3 +1502,11 @@
 .fa-circle-o-notch:before {
 .fa-circle-o-notch:before {
   content: "\f1ce";
   content: "\f1ce";
 }
 }
+.fa-ra:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}

BIN
fonts/FontAwesome.otf


+ 4 - 0
less/icons.less

@@ -479,3 +479,7 @@
 .@{fa-css-prefix}-support:before,
 .@{fa-css-prefix}-support:before,
 .@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
 .@{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}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
+.@{fa-css-prefix}-ra:before,
+.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
+.@{fa-css-prefix}-ge:before,
+.@{fa-css-prefix}-empire:before { content: @fa-var-empire; }

+ 2 - 0
less/variables.less

@@ -139,6 +139,7 @@
 @fa-var-eject: "\f052";
 @fa-var-eject: "\f052";
 @fa-var-ellipsis-h: "\f141";
 @fa-var-ellipsis-h: "\f141";
 @fa-var-ellipsis-v: "\f142";
 @fa-var-ellipsis-v: "\f142";
+@fa-var-empire: "\f1d1";
 @fa-var-envelope: "\f0e0";
 @fa-var-envelope: "\f0e0";
 @fa-var-envelope-o: "\f003";
 @fa-var-envelope-o: "\f003";
 @fa-var-envelope-square: "\f199";
 @fa-var-envelope-square: "\f199";
@@ -303,6 +304,7 @@
 @fa-var-quote-left: "\f10d";
 @fa-var-quote-left: "\f10d";
 @fa-var-quote-right: "\f10e";
 @fa-var-quote-right: "\f10e";
 @fa-var-random: "\f074";
 @fa-var-random: "\f074";
+@fa-var-rebel: "\f1d0";
 @fa-var-recycle: "\f1b8";
 @fa-var-recycle: "\f1b8";
 @fa-var-reddit: "\f1a1";
 @fa-var-reddit: "\f1a1";
 @fa-var-reddit-square: "\f1a2";
 @fa-var-reddit-square: "\f1a2";

+ 4 - 0
scss/_icons.scss

@@ -142,6 +142,8 @@
 .#{$fa-css-prefix}-eject:before { content: $fa-var-eject; }
 .#{$fa-css-prefix}-eject:before { content: $fa-var-eject; }
 .#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; }
 .#{$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}-ellipsis-v:before { content: $fa-var-ellipsis-v; }
+.#{$fa-css-prefix}-ge:before,
+.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; }
 .#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; }
 .#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; }
 .#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; }
 .#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; }
 .#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; }
 .#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; }
@@ -332,6 +334,8 @@
 .#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; }
 .#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; }
 .#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; }
 .#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; }
 .#{$fa-css-prefix}-random:before { content: $fa-var-random; }
 .#{$fa-css-prefix}-random:before { content: $fa-var-random; }
+.#{$fa-css-prefix}-ra:before,
+.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; }
 .#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; }
 .#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; }
 .#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; }
 .#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; }
 .#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; }
 .#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; }

+ 2 - 0
scss/_variables.scss

@@ -139,6 +139,7 @@ $fa-var-drupal: "\f1a9";
 $fa-var-eject: "\f052";
 $fa-var-eject: "\f052";
 $fa-var-ellipsis-h: "\f141";
 $fa-var-ellipsis-h: "\f141";
 $fa-var-ellipsis-v: "\f142";
 $fa-var-ellipsis-v: "\f142";
+$fa-var-empire: "\f1d1";
 $fa-var-envelope: "\f0e0";
 $fa-var-envelope: "\f0e0";
 $fa-var-envelope-o: "\f003";
 $fa-var-envelope-o: "\f003";
 $fa-var-envelope-square: "\f199";
 $fa-var-envelope-square: "\f199";
@@ -303,6 +304,7 @@ $fa-var-question-circle: "\f059";
 $fa-var-quote-left: "\f10d";
 $fa-var-quote-left: "\f10d";
 $fa-var-quote-right: "\f10e";
 $fa-var-quote-right: "\f10e";
 $fa-var-random: "\f074";
 $fa-var-random: "\f074";
+$fa-var-rebel: "\f1d0";
 $fa-var-recycle: "\f1b8";
 $fa-var-recycle: "\f1b8";
 $fa-var-reddit: "\f1a1";
 $fa-var-reddit: "\f1a1";
 $fa-var-reddit-square: "\f1a2";
 $fa-var-reddit-square: "\f1a2";

+ 3 - 3
src/_includes/brand-adblock-warning.html

@@ -1,5 +1,5 @@
 <h4><i class="fa fa-warning"></i> Warning!</h4>
 <h4><i class="fa fa-warning"></i> Warning!</h4>
-Apparently, Adblock Plus automatically removes many Font Awesome brand icons with their "Remove Social
-Media Buttons" feature. We will not use hacks to force them to display. Please
-<a href="https://adblockplus.org/en/bugs" class="alert-link">report an issue with Adblock</a> if you believe this to be
+Apparently, Adblock Plus can remove Font Awesome brand icons with their "Remove Social
+Media Buttons" setting. We will not use hacks to force them to display. Please
+<a href="https://adblockplus.org/en/bugs" class="alert-link">report an issue with Adblock Plus</a> if you believe this to be
 an error. To work around this, you'll need to modify the social icon class names.
 an error. To work around this, you'll need to modify the social icon class names.

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


+ 19 - 0
src/icons.yml

@@ -3120,3 +3120,22 @@ icons:
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
       - Spinner Icons
       - Spinner Icons
+
+
+  - name:       Rebel Alliance
+    id:         rebel
+    unicode:    f1d0
+    created:    4.1
+    aliases:
+      - ra
+    categories:
+      - Brand Icons
+
+  - name:       Galactic Empire
+    id:         empire
+    unicode:    f1d1
+    created:    4.1
+    aliases:
+      - ge
+    categories:
+      - Brand Icons