aboutsummaryrefslogtreecommitdiffstats
path: root/library/font_awesome/scss/font-awesome.scss
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
committerredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
commit9446d0cbb463af6a256efebf97e10618469f1193 (patch)
tree3704de63c7188086ea6a5399094dfde170afaa69 /library/font_awesome/scss/font-awesome.scss
parent8a41e2a011bd1c69c138fb75d138ed2bb4bf779f (diff)
parent3fe8fc0aa80a03fc63905e1e80999e6ccb8672e8 (diff)
downloadvolse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.gz
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.bz2
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.zip
Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
Diffstat (limited to 'library/font_awesome/scss/font-awesome.scss')
-rw-r--r--library/font_awesome/scss/font-awesome.scss35
1 files changed, 10 insertions, 25 deletions
diff --git a/library/font_awesome/scss/font-awesome.scss b/library/font_awesome/scss/font-awesome.scss
index e5903d856..a19d664c3 100644
--- a/library/font_awesome/scss/font-awesome.scss
+++ b/library/font_awesome/scss/font-awesome.scss
@@ -1,33 +1,18 @@
/*!
- * Font Awesome 3.2.1
- * the iconic font designed for Bootstrap
- * ------------------------------------------------------------------------------
- * The full suite of pictographic icons, examples, and documentation can be
- * found at http://fontawesome.io. Stay up to date on Twitter at
- * http://twitter.com/fontawesome.
- *
- * License
- * ------------------------------------------------------------------------------
- * - The Font Awesome font is licensed under SIL OFL 1.1 -
- * http://scripts.sil.org/OFL
- * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- * http://opensource.org/licenses/mit-license.html
- * - Font Awesome documentation licensed under CC BY 3.0 -
- * http://creativecommons.org/licenses/by/3.0/
- * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- * Author - Dave Gandy
- * ------------------------------------------------------------------------------
- * Email: dave@fontawesome.io
- * Twitter: http://twitter.com/davegandy
- * Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
@import "variables";
@import "mixins";
@import "path";
@import "core";
-@import "bootstrap";
-@import "extras";
+@import "larger";
+@import "fixed-width";
+@import "list";
+@import "bordered-pulled";
+@import "animated";
+@import "rotated-flipped";
+@import "stacked";
@import "icons";
+@import "screen-reader";