FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-28 22:41:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

scss mixins and variables updated

Browse Source
This commit is contained in:
davegandy 2013-06-12 10:33:11 -04:00
parent 19aaed3ddd
commit 96298854ea
7 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_config.yml
View File

@ -10,6 +10,7 @@ plugins: src/_plugins
pygments: true pygments: true
permalink: pretty permalink: pretty
# ensures SCSS files are compiled
include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss] include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss]
# used in building icon pages # used in building icon pages

14
scss/_mixins.scss
View File

@ -1,5 +1,19 @@
// Mixins // Mixins
@mixin icon($icon) {
@include icon-FontAwesome();
content: $icon;
}
@mixin icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
}
@mixin border-radius($radius) { @mixin border-radius($radius) {
-webkit-border-radius: $radius; -webkit-border-radius: $radius;
-moz-border-radius: $radius; -moz-border-radius: $radius;

1
scss/_variables.scss
View File

@ -6,3 +6,4 @@ $borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default; $iconMuted: #eeeeee !default;
$iconLight: white !default; $iconLight: white !default;
$iconDark: #333333 !default; $iconDark: #333333 !default;
$icons-li-width: 30/14em;

27
scss/font-awesome-ie7.scss
View File

@ -1,25 +1,28 @@
/*! Font Awesome 3.1.0 /*!
* Font Awesome 3.2.0
* the iconic font designed for Bootstrap * the iconic font designed for Bootstrap
* ------------------------------------------------------- * ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation * The full suite of pictographic icons, examples, and documentation can be
* can be found at: http://fontawesome.io * found at http://fontawesome.io. Stay up to date on Twitter at
* http://twitter.com/fontawesome.
* *
* License * License
* ------------------------------------------------------- * ------------------------------------------------------------------------------
* - The Font Awesome font is licensed under the SIL Open Font License v1.1 - * - The Font Awesome font is licensed under SIL OFL 1.1 -
* http://scripts.sil.org/OFL * http://scripts.sil.org/OFL
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
* http://opensource.org/licenses/mit-license.html * http://opensource.org/licenses/mit-license.html
* - Font Awesome documentation licensed under CC BY 3.0 License - * - Font Awesome documentation licensed under CC BY 3.0 -
* http://creativecommons.org/licenses/by/3.0/ * http://creativecommons.org/licenses/by/3.0/
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated: * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
* "Font Awesome by Dave Gandy - http://fontawesome.io" * "Font Awesome by Dave Gandy - http://fontawesome.io"
* *
* Contact * Author - Dave Gandy
* ------------------------------------------------------- * ------------------------------------------------------------------------------
* Email: dave@fontawesome.io * Email: dave@fontawesome.io
* Twitter: http://twitter.com/fortaweso_me * Twitter: http://twitter.com/byscuits
* Work: Lead Product Designer @ http://kyruus.com */ * Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/
.icon-large { .icon-large {
font-size: 4 / 3em; font-size: 4 / 3em;

14
src/assets/font-awesome/scss/_mixins.scss vendored
View File

@ -1,5 +1,19 @@
// Mixins // Mixins
@mixin icon($icon) {
@include icon-FontAwesome();
content: $icon;
}
@mixin icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
}
@mixin border-radius($radius) { @mixin border-radius($radius) {
-webkit-border-radius: $radius; -webkit-border-radius: $radius;
-moz-border-radius: $radius; -moz-border-radius: $radius;

3
src/assets/font-awesome/scss/_variables.scss vendored
View File

@ -1,3 +1,5 @@
---
---
// Variables // Variables
$FontAwesomePath: "../font" !default; $FontAwesomePath: "../font" !default;
@ -6,3 +8,4 @@ $borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default; $iconMuted: #eeeeee !default;
$iconLight: white !default; $iconLight: white !default;
$iconDark: #333333 !default; $iconDark: #333333 !default;
$icons-li-width: 30/14em;

25
src/assets/font-awesome/scss/font-awesome-ie7.scss vendored
View File

@ -1,25 +1,6 @@
/*! Font Awesome 3.1.0 ---
* the iconic font designed for Bootstrap ---
* ------------------------------------------------------- {% include license-code.less %}
* 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 */
.icon-large { .icon-large {
font-size: 4 / 3em; font-size: 4 / 3em;