FlandreScarle7/Fork-Awesome
1
0
Fork 0
mirror of https://github.com/ForkAwesome/Fork-Awesome.git synced 2024-12-26 21:41:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from james-johnston-thumbtack/font-face-naming

Browse Source 
Allow custom naming of font family
This commit is contained in:
Julien Deswaef 2018-02-04 12:21:27 -08:00 committed by GitHub
commit 860aecf5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_config.yml
View File

@ -54,6 +54,7 @@ fontawesome:
twitter: fontawesome
tagline: The iconic font and CSS toolkit
css_prefix: fa
font_family: FontAwesome
author:
name: Dave Gandy
email: dave@fontawesome.io

2
less/core.less
View File

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

2
less/mixins.less
View File

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

2
less/path.less
View File

@ -2,7 +2,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
font-family: '@{fa-font-family}';
src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),

1
less/variables.less
View File

@ -6,6 +6,7 @@
@fa-line-height-base: 1;
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa;
@fa-font-family: FontAwesome;
@fa-version: "4.7.0";
@fa-border-color: #eee;
@fa-inverse: #fff;

2
scss/_core.scss
View File

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

2
scss/_mixins.scss
View File

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

2
scss/_path.scss
View File

@ -2,7 +2,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
font-family: '#{$fa-font-family}';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),

1
scss/_variables.scss
View File

@ -6,6 +6,7 @@ $fa-font-size-base: 14px !default;
$fa-line-height-base: 1 !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default;
$fa-font-family: FontAwesome !default;
$fa-version: "4.7.0" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;

2
src/_includes/code/core.less
View File

@ -1,5 +1,5 @@
display: inline-block;
font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
font: normal normal normal @fa-font-size-base/@fa-line-height-base @fa-font-family; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;

2
src/_includes/code/core.scss
View File

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

2
src/assets/font-awesome/less/path.less vendored
View File

@ -2,7 +2,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
font-family: '@{fa-font-family}';
src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),

1
src/assets/font-awesome/less/variables.less vendored
View File

@ -8,6 +8,7 @@
@fa-line-height-base: 1;
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: {{ site.fontawesome.css_prefix }};
@fa-font-family: {{ site.fontawesome.font_family }};
@fa-version: "{{ site.fontawesome.version }}";
@fa-border-color: #eee;
@fa-inverse: #fff;

2
src/assets/font-awesome/scss/_path.scss vendored
View File

@ -2,7 +2,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
font-family: '#{$fa-font-family}';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),

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

@ -8,6 +8,7 @@ $fa-font-size-base: 14px !default;
$fa-line-height-base: 1 !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: {{ site.fontawesome.css_prefix }} !default;
$fa-font-family: {{ site.fontawesome.font_family }} !default;
$fa-version: "{{ site.fontawesome.version }}" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;