From 2db9a376886c0fc5fa20a16ff23abad4b16b2a02 Mon Sep 17 00:00:00 2001 From: davegandy Date: Wed, 8 May 2013 22:56:22 -0400 Subject: [PATCH] updating font awesome license in less files --- .../font-awesome/css/font-awesome-ie7.css | 151 +++++++++++++++++- .../assets/font-awesome/css/font-awesome.css | 18 ++- build/assets/font-awesome/less/core.less | 4 +- .../font-awesome/less/font-awesome-ie7.less | 60 ++++++- .../font-awesome/less/font-awesome.less | 12 +- 5 files changed, 223 insertions(+), 22 deletions(-) diff --git a/build/assets/font-awesome/css/font-awesome-ie7.css b/build/assets/font-awesome/css/font-awesome-ie7.css index a8b2bb66c..2072c87b6 100644 --- a/build/assets/font-awesome/css/font-awesome-ie7.css +++ b/build/assets/font-awesome/css/font-awesome-ie7.css @@ -3,16 +3,18 @@ * the iconic font designed for Bootstrap * ------------------------------------------------------- * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * 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 + * - 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 - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - 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://fortawesome.github.com/Font-Awesome" + * "Font Awesome by Dave Gandy - http://fontawesome.io" * Contact * ------------------------------------------------------- @@ -812,3 +814,144 @@ ul.icons { .icon-folder-open-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); } +.icon-expand-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-collapse-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-smile { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-frown { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-meh { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-gamepad { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-keyboard { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-flag-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-flag-checkered { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-terminal { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-code { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-reply-all { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-mail-reply-all { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-star-half-empty { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-location-arrow { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-crop { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-code-fork { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-unlink { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-question { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-info { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-exclamation { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-superscript { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-subscript { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-eraser { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-puzzle-piece { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-microphone { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-microphone-off { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-shield { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-calendar-empty { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-fire-extinguisher { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-rocket { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-maxcdn { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-left { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-right { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-up { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-chevron-sign-down { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-html5 { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-css3 { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-anchor { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-unlock-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-bullseye { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ellipsis-horizontal { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ellipsis-vertical { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-rss-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-play-sign { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-ticket { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} +.icon-minus-sign-alt { + *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); +} diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css index ce12b6713..a914ac156 100644 --- a/build/assets/font-awesome/css/font-awesome.css +++ b/build/assets/font-awesome/css/font-awesome.css @@ -1,18 +1,20 @@ /*! * Font Awesome 3.1.0 - * the iconic font designed for use with Twitter Bootstrap + * the iconic font designed for Bootstrap * ------------------------------------------------------- * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * 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 + * - 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 - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - 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://fortawesome.github.com/Font-Awesome" + * "Font Awesome by Dave Gandy - http://fontawesome.io" * Contact * ------------------------------------------------------- @@ -53,8 +55,10 @@ } /* makes sure icons active on rollover in links */ a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; +a [class*=" icon-"], +a [class^="icon-"]:before, +a [class*=" icon-"]:before { + display: inline; } /* increased font size for icon-large */ li [class^="icon-"], diff --git a/build/assets/font-awesome/less/core.less b/build/assets/font-awesome/less/core.less index 63c7c0ca4..5ef4d0fd1 100644 --- a/build/assets/font-awesome/less/core.less +++ b/build/assets/font-awesome/less/core.less @@ -24,11 +24,11 @@ font-size: 4/3em; } - /* makes sure icons active on rollover in links */ +/* makes sure icons active on rollover in links */ a { [class^="icon-"], [class*=" icon-"] { - display: inline-block; + &, &:before { display: inline; } } } diff --git a/build/assets/font-awesome/less/font-awesome-ie7.less b/build/assets/font-awesome/less/font-awesome-ie7.less index 81d348a51..18d0b1725 100644 --- a/build/assets/font-awesome/less/font-awesome-ie7.less +++ b/build/assets/font-awesome/less/font-awesome-ie7.less @@ -3,16 +3,18 @@ * the iconic font designed for Bootstrap * ------------------------------------------------------- * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * 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 + * - 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 - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - 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://fortawesome.github.com/Font-Awesome" + * "Font Awesome by Dave Gandy - http://fontawesome.io" * Contact * ------------------------------------------------------- @@ -345,3 +347,53 @@ ul.icons { .icon-reply { .ie7icon(''); } .icon-folder-close-alt { .ie7icon(''); } .icon-folder-open-alt { .ie7icon(''); } +.icon-expand-alt { .ie7icon(''); } +.icon-collapse-alt { .ie7icon(''); } +.icon-smile { .ie7icon(''); } +.icon-frown { .ie7icon(''); } +.icon-meh { .ie7icon(''); } +.icon-gamepad { .ie7icon(''); } +.icon-keyboard { .ie7icon(''); } +.icon-flag-alt { .ie7icon(''); } +.icon-flag-checkered { .ie7icon(''); } + +.icon-terminal { .ie7icon(''); } +.icon-code { .ie7icon(''); } +.icon-reply-all { .ie7icon(''); } +.icon-mail-reply-all { .ie7icon(''); } +.icon-star-half-empty { .ie7icon(''); } +.icon-location-arrow { .ie7icon(''); } +.icon-crop { .ie7icon(''); } +.icon-code-fork { .ie7icon(''); } +.icon-unlink { .ie7icon(''); } +.icon-question { .ie7icon(''); } +.icon-info { .ie7icon(''); } +.icon-exclamation { .ie7icon(''); } +.icon-superscript { .ie7icon(''); } +.icon-subscript { .ie7icon(''); } +.icon-eraser { .ie7icon(''); } +.icon-puzzle-piece { .ie7icon(''); } + +.icon-microphone { .ie7icon(''); } +.icon-microphone-off { .ie7icon(''); } +.icon-shield { .ie7icon(''); } +.icon-calendar-empty { .ie7icon(''); } +.icon-fire-extinguisher { .ie7icon(''); } +.icon-rocket { .ie7icon(''); } +.icon-maxcdn { .ie7icon(''); } +.icon-chevron-sign-left { .ie7icon(''); } +.icon-chevron-sign-right { .ie7icon(''); } +.icon-chevron-sign-up { .ie7icon(''); } +.icon-chevron-sign-down { .ie7icon(''); } +.icon-html5 { .ie7icon(''); } +.icon-css3 { .ie7icon(''); } +.icon-anchor { .ie7icon(''); } +.icon-unlock-alt { .ie7icon(''); } + +.icon-bullseye { .ie7icon(''); } +.icon-ellipsis-horizontal { .ie7icon(''); } +.icon-ellipsis-vertical { .ie7icon(''); } +.icon-rss-sign { .ie7icon(''); } +.icon-play-sign { .ie7icon(''); } +.icon-ticket { .ie7icon(''); } +.icon-minus-sign-alt { .ie7icon(''); } diff --git a/build/assets/font-awesome/less/font-awesome.less b/build/assets/font-awesome/less/font-awesome.less index 8d1035d30..04023c411 100644 --- a/build/assets/font-awesome/less/font-awesome.less +++ b/build/assets/font-awesome/less/font-awesome.less @@ -1,18 +1,20 @@ /*! * Font Awesome 3.1.0 - * the iconic font designed for use with Twitter Bootstrap + * the iconic font designed for Bootstrap * ------------------------------------------------------- * The full suite of pictographic icons, examples, and documentation - * can be found at: http://fortawesome.github.com/Font-Awesome/ + * 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 + * - 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 - * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - 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://fortawesome.github.com/Font-Awesome" + * "Font Awesome by Dave Gandy - http://fontawesome.io" * Contact * -------------------------------------------------------