Merge remote-tracking branch 'origin/Release02x01'

foswiki · Nov 22, 2016 · b8a8dc4 · b8a8dc4
2 parents 845be81 + 23ee25f
commit b8a8dc4
Show file tree

Hide file tree

Showing 9 changed files with 2,870 additions and 693 deletions.
diff --git a/JQueryPlugin/data/System/JQueryFontAwesome.txt b/JQueryPlugin/data/System/JQueryFontAwesome.txt
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FONTAWESOME.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FONTAWESOME.pm
@@ -28,7 +28,7 @@ sub new {
     my $this = bless(
         $class->SUPER::new(
             name     => 'FontAwesome',
-            version  => '4.6.3',
+            version  => '4.7.0',
             author   => 'Dave Gandy',
             homepage => 'http://fontawesome.io',
             css      => [ 'fontawesome.css', 'icon-animate.css' ],

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/FontAwesome.otf b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/FontAwesome.otf
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.eot b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.eot
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.svg b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.svg
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.ttf b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.ttf
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.woff b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.woff
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.woff2 b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome-webfont.woff2
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome.uncompressed.css b/JQueryPlugin/pub/System/JQueryPlugin/plugins/fontawesome/fontawesome.uncompressed.css
@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('fontawesome-webfont.eot?v=4.6.3');
-  src: url('fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('fontawesome-webfont.woff?v=4.6.3') format('woff'), url('fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
+  src: url('fontawesome-webfont.eot?v=4.7.0');
+  src: url('fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('fontawesome-webfont.woff?v=4.7.0') format('woff'), url('fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -1832,6 +1832,7 @@
   content: "\f23e";
 }
 .fa-battery-4:before,
+.fa-battery:before,
 .fa-battery-full:before {
   content: "\f240";
 }
@@ -2178,6 +2179,143 @@
 .fa-font-awesome:before {
   content: "\f2b4";
 }
+.fa-handshake-o:before {
+  content: "\f2b5";
+}
+.fa-envelope-open:before {
+  content: "\f2b6";
+}
+.fa-envelope-open-o:before {
+  content: "\f2b7";
+}
+.fa-linode:before {
+  content: "\f2b8";
+}
+.fa-address-book:before {
+  content: "\f2b9";
+}
+.fa-address-book-o:before {
+  content: "\f2ba";
+}
+.fa-vcard:before,
+.fa-address-card:before {
+  content: "\f2bb";
+}
+.fa-vcard-o:before,
+.fa-address-card-o:before {
+  content: "\f2bc";
+}
+.fa-user-circle:before {
+  content: "\f2bd";
+}
+.fa-user-circle-o:before {
+  content: "\f2be";
+}
+.fa-user-o:before {
+  content: "\f2c0";
+}
+.fa-id-badge:before {
+  content: "\f2c1";
+}
+.fa-drivers-license:before,
+.fa-id-card:before {
+  content: "\f2c2";
+}
+.fa-drivers-license-o:before,
+.fa-id-card-o:before {
+  content: "\f2c3";
+}
+.fa-quora:before {
+  content: "\f2c4";
+}
+.fa-free-code-camp:before {
+  content: "\f2c5";
+}
+.fa-telegram:before {
+  content: "\f2c6";
+}
+.fa-thermometer-4:before,
+.fa-thermometer:before,
+.fa-thermometer-full:before {
+  content: "\f2c7";
+}
+.fa-thermometer-3:before,
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8";
+}
+.fa-thermometer-2:before,
+.fa-thermometer-half:before {
+  content: "\f2c9";
+}
+.fa-thermometer-1:before,
+.fa-thermometer-quarter:before {
+  content: "\f2ca";
+}
+.fa-thermometer-0:before,
+.fa-thermometer-empty:before {
+  content: "\f2cb";
+}
+.fa-shower:before {
+  content: "\f2cc";
+}
+.fa-bathtub:before,
+.fa-s15:before,
+.fa-bath:before {
+  content: "\f2cd";
+}
+.fa-podcast:before {
+  content: "\f2ce";
+}
+.fa-window-maximize:before {
+  content: "\f2d0";
+}
+.fa-window-minimize:before {
+  content: "\f2d1";
+}
+.fa-window-restore:before {
+  content: "\f2d2";
+}
+.fa-times-rectangle:before,
+.fa-window-close:before {
+  content: "\f2d3";
+}
+.fa-times-rectangle-o:before,
+.fa-window-close-o:before {
+  content: "\f2d4";
+}
+.fa-bandcamp:before {
+  content: "\f2d5";
+}
+.fa-grav:before {
+  content: "\f2d6";
+}
+.fa-etsy:before {
+  content: "\f2d7";
+}
+.fa-imdb:before {
+  content: "\f2d8";
+}
+.fa-ravelry:before {
+  content: "\f2d9";
+}
+.fa-eercast:before {
+  content: "\f2da";
+}
+.fa-microchip:before {
+  content: "\f2db";
+}
+.fa-snowflake-o:before {
+  content: "\f2dc";
+}
+.fa-superpowers:before {
+  content: "\f2dd";
+}
+.fa-wpexplorer:before {
+  content: "\f2de";
+}
+.fa-meetup:before {
+  content: "\f2e0";
+}
 .sr-only {
   position: absolute;
   width: 1px;