Browse Source

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.
pull/30/head
Evan Theurer 11 years ago
parent
commit
18db543fbd
  1. 2
      .gitignore
  2. 1
      Makefile
  3. 2
      src/styles/font-awesome.scss
  4. 2
      src/styles/libs/bootstrap/README.md
  5. 4
      src/styles/libs/font-awesome/README.md
  6. 0
      src/styles/libs/font-awesome/fonts/FontAwesome.otf
  7. 12
      src/styles/libs/font-awesome/fonts/LISCENCE
  8. 0
      src/styles/libs/font-awesome/fonts/fontawesome-webfont.eot
  9. 0
      src/styles/libs/font-awesome/fonts/fontawesome-webfont.svg
  10. 0
      src/styles/libs/font-awesome/fonts/fontawesome-webfont.ttf
  11. 0
      src/styles/libs/font-awesome/fonts/fontawesome-webfont.woff
  12. 9
      src/styles/libs/font-awesome/scss/LISCENCE
  13. 0
      src/styles/libs/font-awesome/scss/_bordered-pulled.scss
  14. 0
      src/styles/libs/font-awesome/scss/_core.scss
  15. 0
      src/styles/libs/font-awesome/scss/_fixed-width.scss
  16. 0
      src/styles/libs/font-awesome/scss/_icons.scss
  17. 0
      src/styles/libs/font-awesome/scss/_larger.scss
  18. 0
      src/styles/libs/font-awesome/scss/_list.scss
  19. 0
      src/styles/libs/font-awesome/scss/_mixins.scss
  20. 0
      src/styles/libs/font-awesome/scss/_path.scss
  21. 0
      src/styles/libs/font-awesome/scss/_rotated-flipped.scss
  22. 0
      src/styles/libs/font-awesome/scss/_spinning.scss
  23. 0
      src/styles/libs/font-awesome/scss/_stacked.scss
  24. 0
      src/styles/libs/font-awesome/scss/_variables.scss
  25. 0
      src/styles/libs/font-awesome/scss/font-awesome.scss
  26. 31
      src/styles/libs/fontawesome/README.md

2
.gitignore vendored

@ -11,7 +11,7 @@ @@ -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

1
Makefile

@ -86,6 +86,7 @@ assets: styles javascript @@ -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

2
src/styles/font-awesome.scss vendored

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@import "compass";
@import "global/variables";
@import "libs/fontawesome/fontawesome/font-awesome";
@import "libs/font-awesome/scss/font-awesome";

2
src/styles/libs/bootstrap/README.md

@ -1,4 +1,4 @@ @@ -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.

4
src/styles/libs/font-awesome/README.md

@ -0,0 +1,4 @@ @@ -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.

0
src/styles/libs/fontawesome/fonts/FontAwesome.otf → src/styles/libs/font-awesome/fonts/FontAwesome.otf

12
src/styles/libs/font-awesome/fonts/LISCENCE

@ -0,0 +1,12 @@ @@ -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.

0
src/styles/libs/fontawesome/fonts/fontawesome-webfont.eot → src/styles/libs/font-awesome/fonts/fontawesome-webfont.eot

0
src/styles/libs/fontawesome/fonts/fontawesome-webfont.svg → src/styles/libs/font-awesome/fonts/fontawesome-webfont.svg

Before

Width:  |  Height:  |  Size: 197 KiB

After

Width:  |  Height:  |  Size: 197 KiB

0
src/styles/libs/fontawesome/fonts/fontawesome-webfont.ttf → src/styles/libs/font-awesome/fonts/fontawesome-webfont.ttf

0
src/styles/libs/fontawesome/fonts/fontawesome-webfont.woff → src/styles/libs/font-awesome/fonts/fontawesome-webfont.woff

9
src/styles/libs/font-awesome/scss/LISCENCE

@ -0,0 +1,9 @@ @@ -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)

0
src/styles/libs/fontawesome/fontawesome/_bordered-pulled.scss → src/styles/libs/font-awesome/scss/_bordered-pulled.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_core.scss → src/styles/libs/font-awesome/scss/_core.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_fixed-width.scss → src/styles/libs/font-awesome/scss/_fixed-width.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_icons.scss → src/styles/libs/font-awesome/scss/_icons.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_larger.scss → src/styles/libs/font-awesome/scss/_larger.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_list.scss → src/styles/libs/font-awesome/scss/_list.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_mixins.scss → src/styles/libs/font-awesome/scss/_mixins.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_path.scss → src/styles/libs/font-awesome/scss/_path.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_rotated-flipped.scss → src/styles/libs/font-awesome/scss/_rotated-flipped.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_spinning.scss → src/styles/libs/font-awesome/scss/_spinning.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_stacked.scss → src/styles/libs/font-awesome/scss/_stacked.scss vendored

0
src/styles/libs/fontawesome/fontawesome/_variables.scss → src/styles/libs/font-awesome/scss/_variables.scss vendored

0
src/styles/libs/fontawesome/fontawesome/font-awesome.scss → src/styles/libs/font-awesome/scss/font-awesome.scss vendored

31
src/styles/libs/fontawesome/README.md

@ -1,31 +0,0 @@ @@ -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.
Loading…
Cancel
Save