Skip to content

Commit

Permalink
Adding module name prefix to font-Awesome resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@karma4u101
karma4u101 committed Nov 30, 2018
1 parent faad1ef commit dde6b68
Show file tree
Hide file tree
Showing 17 changed files with 182 additions and 123 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -5,13 +5,16 @@ For update history see the [History log](https://github.com/karma4u101/FoBo/tree
section

**Latest Stable Releases:**
- **2018-12-01** -- FoBo Module v2.1 for Lift 3.3
- **2018-07-18** -- FoBo Module v2.0 for Lift 3.3
- **2018-01-28** -- FoBo Module v2.0
- **2016-10-04** -- FoBo Module v1.7
- **2016-06-25** -- FoBo Module v1.6
- **2015-12-30** -- FoBo Module v1.5.1

**Latest Updates:**
- **2018-11-28** -- [PR #168](https://github.com/karma4u101/FoBo/pull/168) FoBo v2.1 -- Font Awesome v5.5.0
- **2018-11-28** -- [PR #169](https://github.com/karma4u101/FoBo/pull/169) FoBo v2.1 -- Bootstrap v4.1.3
- **2018-07-18** -- [PR #166](https://github.com/karma4u101/FoBo/pull/166) FoBo v2.0 -- Release FoBo v2.0 for Lift v3.3
- **2018-01-21** -- [PR #126](https://github.com/karma4u101/FoBo/pull/157) FoBo v2.0 -- Bootstrap v4.0.0
- **2018-01-21** -- [PR #163](https://github.com/karma4u101/FoBo/pull/162) FoBo v2.0 -- Updating Popper to v1.12.9
Expand All @@ -30,6 +33,12 @@ section

See [Development branch](https://github.com/karma4u101/FoBo/tree/develop/CHANGELOG.md)

## FoBo v2.1

### Updated modules
- [Bootstrap v4](https://github.com/karma4u101/FoBo/tree/master/Bootstrap/Bootstrap4) [v4.1.3] - [Bootstrap](https://getbootstrap.com/docs/4.1/)
- [FoBo-Font-Awesome](https://github.com/karma4u101/FoBo/tree/master/Font-Awesome) [v5.5.0] - [Font-Awesome](http://fontawesome.io/)


## FoBo v2.0

Expand Down
10 changes: 6 additions & 4 deletions FoBo/FoBo/src/test/scala/net/liftmodules/fobo/FoBoSpec.scala
View file
Expand Up @@ -554,12 +554,14 @@ object FoBoSpec extends Specification {

//FontAwesome550
"With fobo.Toolkit.init set to fobo.Toolkit.FontAwesome550 the ResourceServer" should {
"allow fobo/all.css" in {
allowToolkitInit(fobo.Toolkit.FontAwesome550, "fobo" :: "all.css" :: Nil) must_== true
"allow fobo/font-awesome/all.css" in {
allowToolkitInit(
fobo.Toolkit.FontAwesome550,
"fobo" :: "font-awesome" :: "all.css" :: Nil) must_== true
}
"rewrit fobo/all.css to fobo/font-awesome/5.5.0/css/all.min.css" in {
"rewrit fobo/font-awesome/all.css to fobo/font-awesome/5.5.0/css/all.min.css" in {
rewriteToolkitInit(fobo.Toolkit.FontAwesome321,
"fobo" :: "all.css" :: Nil) must_==
"fobo" :: "font-awesome" :: "all.css" :: Nil) must_==
List("fobo", "font-awesome", "5.5.0", "css", "all.min.css")
}
}
Expand Down
12 changes: 6 additions & 6 deletions Font-Awesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/all.css
View file
Expand Up @@ -3985,17 +3985,17 @@ readers do not read off random characters that represent icons */
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.svg#fontawesome") format("svg"); }

.fab {
font-family: 'Font Awesome 5 Brands'; }
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff2") format("woff2"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff") format("woff"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.ttf") format("truetype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.svg#fontawesome") format("svg"); }

.far {
font-family: 'Font Awesome 5 Free';
Expand All @@ -4004,8 +4004,8 @@ readers do not read off random characters that represent icons */
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff2") format("woff2"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff") format("woff"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.ttf") format("truetype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.svg#fontawesome") format("svg"); }

.fa,
.fas {
Expand Down
2 changes: 1 addition & 1 deletion ...esome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/all.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...wesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/brands.css
View file
Expand Up @@ -6,8 +6,8 @@
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff2") format("woff2"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.woff") format("woff"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.ttf") format("truetype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-brands-400.svg#fontawesome") format("svg"); }

.fab {
font-family: 'Font Awesome 5 Brands'; }
2 changes: 1 addition & 1 deletion ...me/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/brands.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...esome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/regular.css
View file
Expand Up @@ -6,8 +6,8 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff2") format("woff2"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.woff") format("woff"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.ttf") format("truetype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-regular-400.svg#fontawesome") format("svg"); }

.far {
font-family: 'Font Awesome 5 Free';
Expand Down
2 changes: 1 addition & 1 deletion ...e/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/regular.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...Awesome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/solid.css
View file
Expand Up @@ -6,8 +6,8 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot");
src: url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff2") format("woff2"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff") format("woff"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.ttf") format("truetype"), url("..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot");
src: url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff2") format("woff2"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.woff") format("woff"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.ttf") format("truetype"), url("../..fobo/font-awesome/5.5.0/webfonts/fa-solid-900.svg#fontawesome") format("svg"); }

.fa,
.fas {
Expand Down
2 changes: 1 addition & 1 deletion ...ome/Font-Awesome-Res/src/main/resources/toserve/fobo/font-awesome/5.5.0/css/solid.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 34 additions & 28 deletions Font-Awesome/Font-Awesome-Res/src/main/scala/net/liftmodules/fobofa/fobofares.scala
View file
Expand Up @@ -180,69 +180,75 @@ package object fobofares {

lazy val fontAwesome550 = {
ResourceServer.rewrite {
case "fobo" :: "all.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "all.css" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "all.css")
case "fobo" :: "all.css" :: Nil =>
case "fobo" :: "font-awesome" :: "all.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "all.min.css")

case "fobo" :: "brands.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "brands.css" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "brands.css")
case "fobo" :: "brands.css" :: Nil =>
case "fobo" :: "font-awesome" :: "brands.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "brands.min.css")

case "fobo" :: "fontawesome.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "fontawesome.css" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "fontawesome.css")
case "fobo" :: "fontawesome.css" :: Nil =>
case "fobo" :: "font-awesome" :: "fontawesome.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "fontawesome.min.css")

case "fobo" :: "regular.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "regular.css" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "regular.css")
case "fobo" :: "regular.css" :: Nil =>
case "fobo" :: "font-awesome" :: "regular.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "regular.min.css")

case "fobo" :: "solid.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "solid.css" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "solid.css")
case "fobo" :: "solid.css" :: Nil =>
case "fobo" :: "font-awesome" :: "solid.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "solid.min.css")

case "fobo" :: "svt-with-js.css" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "svt-with-js.css")
case "fobo" :: "svt-with-js.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "svt-with-js.min.css")
case "fobo" :: "font-awesome" :: "svg-with-js.css" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "svg-with-js.css")
case "fobo" :: "font-awesome" :: "svg-with-js.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "svg-with-js.min.css")

case "fobo" :: "v4-shims.css" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "v4-shims.css" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "css", "v4-shims.css")
case "fobo" :: "v4-shims.css" :: Nil =>
case "fobo" :: "font-awesome" :: "v4-shims.css" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "css", "v4-shims.min.css")

case "fobo" :: "all.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "all.js" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "all.js")
case "fobo" :: "all.js" :: Nil =>
case "fobo" :: "font-awesome" :: "all.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "all.min.js")

case "fobo" :: "brand.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "brand.js" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "brand.js")
case "fobo" :: "brand.js" :: Nil =>
case "fobo" :: "font-awesome" :: "brand.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "brand.min.js")

case "fobo" :: "fontawesome.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "fontawesome.js" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "fontawesome.js")
case "fobo" :: "fontawesome.js" :: Nil =>
case "fobo" :: "font-awesome" :: "fontawesome.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "fontawesome.min.js")

case "fobo" :: "regular.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "regular.js" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "regular.js")
case "fobo" :: "regular.js" :: Nil =>
case "fobo" :: "font-awesome" :: "regular.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "regular.min.js")

case "fobo" :: "solid.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "solid.js" :: Nil if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "solid.js")
case "fobo" :: "solid.js" :: Nil =>
case "fobo" :: "font-awesome" :: "solid.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "solid.min.js")

case "fobo" :: "v4-shims.js" :: Nil if Props.devMode =>
case "fobo" :: "font-awesome" :: "v4-shims.js" :: Nil
if Props.devMode =>
List("fobo", "font-awesome", "5.5.0", "js", "v4-shims.js")
case "fobo" :: "v4-shims.js" :: Nil =>
case "fobo" :: "font-awesome" :: "v4-shims.js" :: Nil =>
List("fobo", "font-awesome", "5.5.0", "js", "v4-shims.min.js")
}
}
Expand Down

0 comments on commit dde6b68

Please sign in to comment.