FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2025-01-15 17:50:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add(core) font name variable

Browse Source 
~ move font name into variable to allow of using customized FontAwesome
with different font name
This commit is contained in:
Даниил Пронин 2015-05-05 15:14:12 +10:00
parent 8e037207b4
commit 8f9d24d37d
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/core.less
View File

@ -3,7 +3,7 @@
.@{fa-css-prefix} { .@{fa-css-prefix} {
display: inline-block; display: inline-block;
font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration font: normal normal normal @fa-font-size-base/1 @fa-font-name; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094 text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;

3
less/variables.less
View File

@ -2,7 +2,8 @@
// -------------------------- // --------------------------
@fa-font-path: "../fonts"; @fa-font-path: "../fonts";
@fa-font-size-base: 14px; @fa-font-size-base: 14px
@fa-font-name: 'FontAwesome';
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"; // for referencing Bootstrap CDN font files directly //@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa; @fa-css-prefix: fa;
@fa-version: "4.3.0"; @fa-version: "4.3.0";

2
scss/_core.scss
View File

@ -3,7 +3,7 @@
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
display: inline-block; display: inline-block;
font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration font: normal normal normal #{$fa-font-size-base}/1 #{$fa-font-name}; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094 text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;

1
scss/_variables.scss
View File

@ -3,6 +3,7 @@
$fa-font-path: "../fonts" !default; $fa-font-path: "../fonts" !default;
$fa-font-size-base: 14px !default; $fa-font-size-base: 14px !default;
$fa-font-name: 'FontAwesome' !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts" !default; // for referencing Bootstrap CDN font files directly //$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default; $fa-css-prefix: fa !default;
$fa-version: "4.3.0" !default; $fa-version: "4.3.0" !default;