Skip to content
Snippets Groups Projects
Unverified Commit fc67d1cd authored by weaver299's avatar weaver299 Committed by GitHub
Browse files

Merge pull request #16 from ASCWebServices/canini

asc_bootstrap - debugging fontawesome
parents c465a7f2 a40562a1
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ libraries: ...@@ -25,7 +25,7 @@ libraries:
- 'asc_bootstrap/global-styling' - 'asc_bootstrap/global-styling'
- 'asc_bootstrap/bootstrap-scripts' - 'asc_bootstrap/bootstrap-scripts'
- 'asc_bootstrap/osu-webfonts' - 'asc_bootstrap/osu-webfonts'
#- 'asc_bootstrap/font-awesome' - 'asc_bootstrap/font-awesome'
ckeditor_stylesheets: ckeditor_stylesheets:
- css/style.css - css/style.css
......
...@@ -42,7 +42,7 @@ bootstrap-scripts: ...@@ -42,7 +42,7 @@ bootstrap-scripts:
assets/javascripts/bootstrap/scrollspy.js: {} assets/javascripts/bootstrap/scrollspy.js: {}
assets/javascripts/bootstrap/tab.js: {} assets/javascripts/bootstrap/tab.js: {}
assets/javascripts/bootstrap/transition.js: {} assets/javascripts/bootstrap/transition.js: {}
//use.fontawesome.com/releases/v5.2.0/css/all.css: { type: external, minified: true } #//use.fontawesome.com/releases/v5.2.0/css/all.css: { type: external, minified: true }
osu-webfonts: osu-webfonts:
...@@ -55,13 +55,13 @@ osu-webfonts: ...@@ -55,13 +55,13 @@ osu-webfonts:
theme: theme:
https://www.osu.edu/assets/fonts/webfonts.css: { type: external, minified: false } https://www.osu.edu/assets/fonts/webfonts.css: { type: external, minified: false }
#font-awesome: font-awesome:
# remote: https://fortawesome.github.io/Font-Awesome/ remote: https://fortawesome.github.io/Font-Awesome/
# version: 4.5.0 version: 5.2.0
# license: license:
# name: MIT name: MIT
# url: https://fortawesome.github.io/Font-Awesome/license/ url: https://fortawesome.github.io/Font-Awesome/license/
# gpl-compatible: true gpl-compatible: true
# css: css:
# theme: theme:
# https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css: { type: external, minified: true } https://use.fontawesome.com/releases/v5.2.0/css/all.css: { type: external, minified: true }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment