Merge pull request #82 from karma4u101/topic/ppe/issue-80

Adding Font-Awesome v4.6.3 and removing unreleased v4.5.0

CHANGELOG.md

@@ -7,6 +7,7 @@ For update history see the [History log](https://github.com/karma4u101/FoBo/tree
 - **2015-12-30** -- Module v1.5.1
 
 **Latest Updates:**
+- **2016-05-14** -- [Issue #80](https://github.com/karma4u101/FoBo/issues/80) Adding Font-Awesome v4.6.3 (removing unreleased v4.5.0)
 - **2016-04-30** -- [Issue #78](https://github.com/karma4u101/FoBo/issues/78) Adding Angular Material v1.0.8 (removing unreleased v1.0.7)
 - **2016-04-29** -- [Issue #76](https://github.com/karma4u101/FoBo/issues/76) Adding HighlightJS v9.3.0
 - **2016-03-30** -- [Issue #70](https://github.com/karma4u101/FoBo/issues/70) Adding Pace v1.0.2
@@ -36,7 +37,7 @@ FoBo future utilize Lifts page script file's, to avoid inlining of javascript, b
 
 ### Updated modules
 -   [FoBo-Pace](https://github.com/karma4u101/FoBo/tree/master/Pace) Adds v1.0.2 - [Pace](http://github.hubspot.com/pace/docs/welcome/)
--   [FoBo-Font-Awesome](https://github.com/karma4u101/FoBo/tree/master/Font-Awesome) Adds v4.5.0 - [Font Awesome](http://fortawesome.github.com/Font-Awesome/)
+-   [FoBo-Font-Awesome](https://github.com/karma4u101/FoBo/tree/master/Font-Awesome) Adds v4.6.3 - [Font Awesome](http://fortawesome.github.com/Font-Awesome/)
 -   [FoBo-AngularJS core modules](https://github.com/karma4u101/FoBo/tree/master/AngularJS) Adds v1.5.3 - [AngularJS](http://angularjs.org/)
 -   [FoBo-AngularJS Material Design](https://github.com/karma4u101/FoBo/tree/master/AngularJS) Adds v1.0.8 - [Angular Material](https://material.angularjs.org/)
 

FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala

@@ -481,20 +481,21 @@ package object FoBo {
 
     /*===Font Awesome ToolKit===============================================================*/
 
+
    /**
-     * Enable usage of FoBo's FontAwesome resources and API version 4․5․0 in your bootstrap liftweb Boot.
-     * @version 4.5.0
+     * Enable usage of FoBo's FontAwesome resources and API version 4․6․3 in your bootstrap liftweb Boot.
+     * @version 4.6.3
      * 
      * '''Example:'''
      * 
      * {{{
      *   import net.liftmodules.FoBo
      *    :
-     *   FoBo.ToolKit.Init=FoBo.ToolKit.FontAwesome450
+     *   FoBo.ToolKit.Init=FoBo.ToolKit.FontAwesome463
      * }}}
      */    
-     case object FontAwesome450 extends ToolKit {
-       net.liftmodules.FoBoFA.ToolKit.FontAwesome450
+     case object FontAwesome463 extends ToolKit {
+       net.liftmodules.FoBoFA.ToolKit.FontAwesome463
      } 
 
    /**
@@ -1237,19 +1238,19 @@ package object FoBo {
     /*===Font Awesome Resource===============================================================*/
 
     /**
-     * Enable usage of FoBo's FontAwesome resources version 4․5․0 in your bootstrap liftweb Boot.
-     * @version 4.5.0
+     * Enable usage of FoBo's FontAwesome resources version 4․6․3 in your bootstrap liftweb Boot.
+     * @version 4.6.3
      * 
      * '''Example:'''
      * 
      * {{{
      *   import net.liftmodules.FoBo
      *    :
-     *   FoBo.Resource.Init=FoBo.Resource.FontAwesome450
+     *   FoBo.Resource.Init=FoBo.Resource.FontAwesome463
      * }}}
      */    
-     case object FontAwesome450 extends Resource {
-       net.liftmodules.FoBoFA.Resource.FontAwesome450
+     case object FontAwesome463 extends Resource {
+       net.liftmodules.FoBoFA.Resource.FontAwesome463
      }
 
     /**

FoBo/FoBo/src/test/scala/net/liftmodules/FoBo/FoBoSpec.scala

@@ -666,28 +666,28 @@ object FoBoSpec extends Specification  {
      rewriteResource(FoBo.Resource.FontAwesome430,"fobo"::"font-awesome.css"::Nil) must_== 
         List("fobo", "font-awesome", "4.3.0", "css", "font-awesome.min.css")      
     }       
-  }  
+  }   
 
-  //FontAwesome450
-  "With FoBo.ToolKit.Init set to FoBo.ToolKit.FontAwesome450 the ResourceServer" should {    
+  //FontAwesome463
+  "With FoBo.ToolKit.Init set to FoBo.ToolKit.FontAwesome463 the ResourceServer" should {    
     "allow  fobo/font-awesome.css" in {
-      allowToolKitInit(FoBo.ToolKit.FontAwesome450,"fobo"::"font-awesome.css"::Nil) must_== true       
+      allowToolKitInit(FoBo.ToolKit.FontAwesome463,"fobo"::"font-awesome.css"::Nil) must_== true       
     }     
-    "rewrit fobo/font-awesome.css to fobo/font-awesome/4.5.0/css/font-awesome.min.css" in {
-      rewriteToolKitInit(FoBo.ToolKit.FontAwesome450,"fobo"::"font-awesome.css"::Nil) must_== 
-        List("fobo", "font-awesome", "4.5.0", "css", "font-awesome.min.css")      
+    "rewrit fobo/font-awesome.css to fobo/font-awesome/4.6.3/css/font-awesome.min.css" in {
+      rewriteToolKitInit(FoBo.ToolKit.FontAwesome463,"fobo"::"font-awesome.css"::Nil) must_== 
+        List("fobo", "font-awesome", "4.6.3", "css", "font-awesome.min.css")      
     }       
   } 
 
-  "With FoBo.Resource.Init set to FoBo.Resource.FontAwesome450 the ResourceServer" should { 
+  "With FoBo.Resource.Init set to FoBo.Resource.FontAwesome463 the ResourceServer" should { 
     "allow  fobo/font-awesome.css" in  {
-      allowResource(FoBo.Resource.FontAwesome450,"fobo"::"font-awesome.css"::Nil)  must_== true 
+      allowResource(FoBo.Resource.FontAwesome463,"fobo"::"font-awesome.css"::Nil)  must_== true 
     }     
-    "rewrit fobo/font-awesome.css to fobo/font-awesome/4.5.0/css/font-awesome.min.css" in  {
-     rewriteResource(FoBo.Resource.FontAwesome450,"fobo"::"font-awesome.css"::Nil) must_== 
-        List("fobo", "font-awesome", "4.5.0", "css", "font-awesome.min.css")      
+    "rewrit fobo/font-awesome.css to fobo/font-awesome/4.6.3/css/font-awesome.min.css" in  {
+     rewriteResource(FoBo.Resource.FontAwesome463,"fobo"::"font-awesome.css"::Nil) must_== 
+        List("fobo", "font-awesome", "4.6.3", "css", "font-awesome.min.css")      
     }       
-  }    
+  }   
 
   /*=================Google-Code-Prettify ====================================*/
 

Font-Awesome/Font-Awesome-Res/README.md

@@ -5,7 +5,7 @@ but can also be used as-is, see below for setup information.
 
 ## Components and available versions 
 
-- Font Awesome [v3.2.1, v4.0.3, v4.1.0, v4.3.0, v4.5.0] - [Font Awesome](http://fortawesome.github.com/Font-Awesome/)
+- Font Awesome [v3.2.1, v4.0.3, v4.1.0, v4.3.0, v4.6.3] - [Font Awesome](http://fortawesome.github.com/Font-Awesome/)
 
 ## Integration into your project 
 

Font-Awesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/4.5.0/css/font-awesome.css → Font-Awesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/4.6.3/css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.3 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('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.eot?v=4.5.0');
-  src: url('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../fobo/font-awesome/4.5.0/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
+  src: url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.eot?v=4.6.3');
+  src: url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'), url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'), url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'), url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'), url('..fobo/font-awesome/4.6.3/fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -118,31 +118,31 @@
   }
 }
 .fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
   -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
   -webkit-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
   -webkit-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
   -webkit-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   transform: scale(1, -1);
@@ -1383,7 +1383,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1509,6 +1509,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -2084,3 +2085,115 @@
 .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";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}