From 35e8cf79685b32626d63f02f95ebdbd53f3ffc0a Mon Sep 17 00:00:00 2001 From: davegandy Date: Thu, 23 May 2013 14:10:10 -0400 Subject: [PATCH] pulling out license from code into an include, updating config with author employment --- _config.yml | 4 +++ build/_includes/license-code.less | 25 +++++++++++++++++ .../font-awesome/less/font-awesome-ie7.less | 25 +---------------- .../font-awesome/less/font-awesome.less | 27 +++---------------- 4 files changed, 33 insertions(+), 48 deletions(-) create mode 100644 build/_includes/license-code.less diff --git a/_config.yml b/_config.yml index f35fcc086..0bc98775f 100644 --- a/_config.yml +++ b/_config.yml @@ -25,6 +25,10 @@ font_awesome: name: Dave Gandy email: dave@fontawesome.io twitter: byscuits + work: + name: Kyruus + url: http://kyruus.com + title: Lead Product Designer github: url: https://github.com/FortAwesome/Font-Awesome project: Font-Awesome diff --git a/build/_includes/license-code.less b/build/_includes/license-code.less new file mode 100644 index 000000000..719cef608 --- /dev/null +++ b/build/_includes/license-code.less @@ -0,0 +1,25 @@ +/*! + * Font Awesome {{ site.font_awesome.version }} + * the iconic font designed for Bootstrap + * ------------------------------------------------------------------------------ + * The full suite of pictographic icons, examples, and documentation can be + * found at {{ site.font_awesome.url }}. Stay up to date on Twitter at + * http://twitter.com/{{ site.font_awesome.twitter }}. + * + * License + * ------------------------------------------------------------------------------ + * - The Font Awesome font is licensed under {{ site.license.font.version }} - + * {{ site.license.font.url }} + * - Font Awesome CSS, LESS, and SASS files are licensed under {{ site.license.code.version }} - + * {{ site.license.code.url }} + * - Font Awesome documentation licensed under {{ site.license.documentation.version }} - + * {{ site.license.documentation.url }} + * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: + * "Font Awesome by Dave Gandy - {{ site.font_awesome.url }}" + * + * Author - Dave Gandy + * ------------------------------------------------------------------------------ + * Email: {{ site.font_awesome.author.email }} + * Twitter: http://twitter.com/{{ site.font_awesome.author.twitter }} + * Work: {{ site.font_awesome.author.work.title }} @ {{ site.font_awesome.author.work.name }} - {{ site.font_awesome.author.work.url }} + */ \ No newline at end of file diff --git a/build/assets/font-awesome/less/font-awesome-ie7.less b/build/assets/font-awesome/less/font-awesome-ie7.less index fac1aae21..75e91ea2b 100644 --- a/build/assets/font-awesome/less/font-awesome-ie7.less +++ b/build/assets/font-awesome/less/font-awesome-ie7.less @@ -1,29 +1,6 @@ --- --- -/*! - * Font Awesome 3.2.0 - * the iconic font designed for Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fontawesome.io - * - * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License v1.1 - - * http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - * http://opensource.org/licenses/mit-license.html - * - Font Awesome documentation licensed under CC BY 3.0 License - - * 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" - - * Contact - * ------------------------------------------------------- - * Email: dave@fontawesome.io - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com - */ +{% include license-code.less %} .icon-large { font-size: 4/3em; diff --git a/build/assets/font-awesome/less/font-awesome.less b/build/assets/font-awesome/less/font-awesome.less index 18b64f5cb..fa87c2752 100644 --- a/build/assets/font-awesome/less/font-awesome.less +++ b/build/assets/font-awesome/less/font-awesome.less @@ -1,27 +1,6 @@ -/*! - * Font Awesome 3.2.0 - * the iconic font designed for Bootstrap - * ------------------------------------------------------- - * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fontawesome.io - * - * License - * ------------------------------------------------------- - * - The Font Awesome font is licensed under the SIL Open Font License v1.1 - - * http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - * http://opensource.org/licenses/mit-license.html - * - Font Awesome documentation licensed under CC BY 3.0 License - - * 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" - - * Contact - * ------------------------------------------------------- - * Email: dave@fontawesome.io - * Twitter: http://twitter.com/fortaweso_me - * Work: Lead Product Designer @ http://kyruus.com - */ +--- +--- +{% include license-code.less %} @import "variables.less"; @import "mixins.less";