From 18db543fbdea3137a709e32a5eb8503f4e72cbcd Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Fri, 9 May 2014 10:43:30 +0200 Subject: [PATCH] Build fonts. Ignore built fonts file. Update font build. Update .md syntax. Fix permissions on fonts. Move fontawesome to scss. Add liscence files. Update Readme. Move lib fontawesome to font-awesome Update font-awesome paths. --- .gitignore | 2 +- Makefile | 1 + src/styles/font-awesome.scss | 2 +- src/styles/libs/bootstrap/README.md | 2 +- src/styles/libs/font-awesome/README.md | 4 +++ .../fonts/FontAwesome.otf | Bin src/styles/libs/font-awesome/fonts/LISCENCE | 12 +++++++ .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin src/styles/libs/font-awesome/scss/LISCENCE | 9 +++++ .../scss}/_bordered-pulled.scss | 0 .../scss}/_core.scss | 0 .../scss}/_fixed-width.scss | 0 .../scss}/_icons.scss | 0 .../scss}/_larger.scss | 0 .../scss}/_list.scss | 0 .../scss}/_mixins.scss | 0 .../scss}/_path.scss | 0 .../scss}/_rotated-flipped.scss | 0 .../scss}/_spinning.scss | 0 .../scss}/_stacked.scss | 0 .../scss}/_variables.scss | 0 .../scss}/font-awesome.scss | 0 src/styles/libs/fontawesome/README.md | 31 ------------------ 26 files changed, 29 insertions(+), 34 deletions(-) create mode 100644 src/styles/libs/font-awesome/README.md rename src/styles/libs/{fontawesome => font-awesome}/fonts/FontAwesome.otf (100%) create mode 100644 src/styles/libs/font-awesome/fonts/LISCENCE rename src/styles/libs/{fontawesome => font-awesome}/fonts/fontawesome-webfont.eot (100%) mode change 100755 => 100644 rename src/styles/libs/{fontawesome => font-awesome}/fonts/fontawesome-webfont.svg (100%) mode change 100755 => 100644 rename src/styles/libs/{fontawesome => font-awesome}/fonts/fontawesome-webfont.ttf (100%) mode change 100755 => 100644 rename src/styles/libs/{fontawesome => font-awesome}/fonts/fontawesome-webfont.woff (100%) mode change 100755 => 100644 create mode 100644 src/styles/libs/font-awesome/scss/LISCENCE rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_bordered-pulled.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_core.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_fixed-width.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_icons.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_larger.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_list.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_mixins.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_path.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_rotated-flipped.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_spinning.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_stacked.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/_variables.scss (100%) rename src/styles/libs/{fontawesome/fontawesome => font-awesome/scss}/font-awesome.scss (100%) delete mode 100644 src/styles/libs/fontawesome/README.md diff --git a/.gitignore b/.gitignore index 4324c6a5..f06a2578 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ /static/css/main.min.css /static/css/bootstrap.min.css /static/css/font-awesome.min.css -/static/css/fonts/* +/static/fonts/* /static/js/main.min.js /tokens.txt /dist diff --git a/Makefile b/Makefile index 7be53823..d3b68cd7 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ assets: styles javascript styles: SASSFLAGS = --style=expanded styles: + cp -r $(CURDIR)/src/styles/libs/font-awesome/fonts/ $(CURDIR)/static/fonts/ sass --compass --scss $(SASSFLAGS) \ $(CURDIR)/src/styles/main.scss:$(CURDIR)/static/css/main.min.css autoprefixer --browsers $(AUTOPREFIXER_BROWSER_SUPPORT) $(CURDIR)/static/css/main.min.css diff --git a/src/styles/font-awesome.scss b/src/styles/font-awesome.scss index 5fcd4928..1d0dcd70 100644 --- a/src/styles/font-awesome.scss +++ b/src/styles/font-awesome.scss @@ -1,4 +1,4 @@ @import "compass"; @import "global/variables"; -@import "libs/fontawesome/fontawesome/font-awesome"; +@import "libs/font-awesome/scss/font-awesome"; diff --git a/src/styles/libs/bootstrap/README.md b/src/styles/libs/bootstrap/README.md index 332358be..db7cffdc 100644 --- a/src/styles/libs/bootstrap/README.md +++ b/src/styles/libs/bootstrap/README.md @@ -1,4 +1,4 @@ # Bootstrap sass distribution -Downloaded from (link)[https://github.com/twbs/bootstrap-sass/archive/v3.1.1.tar.gz] +Downloaded from [link](https://github.com/twbs/bootstrap-sass/archive/v3.1.1.tar.gz). Used data from `vendor/assets/stylesheets` folder. diff --git a/src/styles/libs/font-awesome/README.md b/src/styles/libs/font-awesome/README.md new file mode 100644 index 00000000..2bcb65bc --- /dev/null +++ b/src/styles/libs/font-awesome/README.md @@ -0,0 +1,4 @@ +# Font-Awesome scss distribution + +Downloaded from [link](http://fortawesome.github.io/Font-Awesome/assets/font-awesome-4.0.3.zip). +Used data from `scss/` and `fonts/`folder. diff --git a/src/styles/libs/fontawesome/fonts/FontAwesome.otf b/src/styles/libs/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from src/styles/libs/fontawesome/fonts/FontAwesome.otf rename to src/styles/libs/font-awesome/fonts/FontAwesome.otf diff --git a/src/styles/libs/font-awesome/fonts/LISCENCE b/src/styles/libs/font-awesome/fonts/LISCENCE new file mode 100644 index 00000000..ffaac99b --- /dev/null +++ b/src/styles/libs/font-awesome/fonts/LISCENCE @@ -0,0 +1,12 @@ +# Liscence info as from [Font-Awesome](http://fortawesome.github.io/Font-Awesome/license/) + +## Font License + +* Applies to all desktop and webfont files in the following directory: `font-awesome/fonts/`. +* License: SIL OFL 1.1 +* URL: [http://scripts.sil.org/OFL](http://scripts.sil.org/OFL) + +## Brand Icons + +* All brand icons are trademarks of their respective owners. +* The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa. diff --git a/src/styles/libs/fontawesome/fonts/fontawesome-webfont.eot b/src/styles/libs/font-awesome/fonts/fontawesome-webfont.eot old mode 100755 new mode 100644 similarity index 100% rename from src/styles/libs/fontawesome/fonts/fontawesome-webfont.eot rename to src/styles/libs/font-awesome/fonts/fontawesome-webfont.eot diff --git a/src/styles/libs/fontawesome/fonts/fontawesome-webfont.svg b/src/styles/libs/font-awesome/fonts/fontawesome-webfont.svg old mode 100755 new mode 100644 similarity index 100% rename from src/styles/libs/fontawesome/fonts/fontawesome-webfont.svg rename to src/styles/libs/font-awesome/fonts/fontawesome-webfont.svg diff --git a/src/styles/libs/fontawesome/fonts/fontawesome-webfont.ttf b/src/styles/libs/font-awesome/fonts/fontawesome-webfont.ttf old mode 100755 new mode 100644 similarity index 100% rename from src/styles/libs/fontawesome/fonts/fontawesome-webfont.ttf rename to src/styles/libs/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/src/styles/libs/fontawesome/fonts/fontawesome-webfont.woff b/src/styles/libs/font-awesome/fonts/fontawesome-webfont.woff old mode 100755 new mode 100644 similarity index 100% rename from src/styles/libs/fontawesome/fonts/fontawesome-webfont.woff rename to src/styles/libs/font-awesome/fonts/fontawesome-webfont.woff diff --git a/src/styles/libs/font-awesome/scss/LISCENCE b/src/styles/libs/font-awesome/scss/LISCENCE new file mode 100644 index 00000000..9e271a7e --- /dev/null +++ b/src/styles/libs/font-awesome/scss/LISCENCE @@ -0,0 +1,9 @@ +# Liscence info as from [Font-Awesome](http://fortawesome.github.io/Font-Awesome/license/) + +## Code License + +* Applies to all CSS and LESS files in the following directories: `font-awesome/css/`, `font-awesome/less/`, `and font-awesome/scss/`. +* License: MIT License +* URL: [http://opensource.org/licenses/mit-license.html](http://opensource.org/licenses/mit-license.html) + + diff --git a/src/styles/libs/fontawesome/fontawesome/_bordered-pulled.scss b/src/styles/libs/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_bordered-pulled.scss rename to src/styles/libs/font-awesome/scss/_bordered-pulled.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_core.scss b/src/styles/libs/font-awesome/scss/_core.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_core.scss rename to src/styles/libs/font-awesome/scss/_core.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_fixed-width.scss b/src/styles/libs/font-awesome/scss/_fixed-width.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_fixed-width.scss rename to src/styles/libs/font-awesome/scss/_fixed-width.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_icons.scss b/src/styles/libs/font-awesome/scss/_icons.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_icons.scss rename to src/styles/libs/font-awesome/scss/_icons.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_larger.scss b/src/styles/libs/font-awesome/scss/_larger.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_larger.scss rename to src/styles/libs/font-awesome/scss/_larger.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_list.scss b/src/styles/libs/font-awesome/scss/_list.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_list.scss rename to src/styles/libs/font-awesome/scss/_list.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_mixins.scss b/src/styles/libs/font-awesome/scss/_mixins.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_mixins.scss rename to src/styles/libs/font-awesome/scss/_mixins.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_path.scss b/src/styles/libs/font-awesome/scss/_path.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_path.scss rename to src/styles/libs/font-awesome/scss/_path.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_rotated-flipped.scss b/src/styles/libs/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_rotated-flipped.scss rename to src/styles/libs/font-awesome/scss/_rotated-flipped.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_spinning.scss b/src/styles/libs/font-awesome/scss/_spinning.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_spinning.scss rename to src/styles/libs/font-awesome/scss/_spinning.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_stacked.scss b/src/styles/libs/font-awesome/scss/_stacked.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_stacked.scss rename to src/styles/libs/font-awesome/scss/_stacked.scss diff --git a/src/styles/libs/fontawesome/fontawesome/_variables.scss b/src/styles/libs/font-awesome/scss/_variables.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/_variables.scss rename to src/styles/libs/font-awesome/scss/_variables.scss diff --git a/src/styles/libs/fontawesome/fontawesome/font-awesome.scss b/src/styles/libs/font-awesome/scss/font-awesome.scss similarity index 100% rename from src/styles/libs/fontawesome/fontawesome/font-awesome.scss rename to src/styles/libs/font-awesome/scss/font-awesome.scss diff --git a/src/styles/libs/fontawesome/README.md b/src/styles/libs/fontawesome/README.md deleted file mode 100644 index 3cf14586..00000000 --- a/src/styles/libs/fontawesome/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Font-Awesome scss distribution - -Downloaded from (link)[http://fortawesome.github.io/Font-Awesome/assets/font-awesome-4.0.3.zip] -Used data from `scss/` and `fonts/`folder. - - -# Liscence info as from (http://fortawesome.github.io/Font-Awesome/license/)[http://fortawesome.github.io/Font-Awesome/license/] - -## Font License - - Applies to all desktop and webfont files in the following directory: `font-awesome/fonts/`. - License: SIL OFL 1.1 - URL: (http://scripts.sil.org/OFL)[http://scripts.sil.org/OFL] - -## Code License - - Applies to all CSS and LESS files in the following directories: `font-awesome/css/`, `font-awesome/less/`, `and font-awesome/scss/`. - License: MIT License - URL: (http://opensource.org/licenses/mit-license.html)[http://opensource.org/licenses/mit-license.html] - -## Documentation License - - Applies to all Font Awesome project files that are not a part of the Font or Code licenses. - License: CC BY 3.0 - URL: (http://creativecommons.org/licenses/by/3.0/)[http://creativecommons.org/licenses/by/3.0/] - -## Brand Icons - - All brand icons are trademarks of their respective owners. - The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa. -