diff options
| author | James Johnston <james.johnston@thumbtack.com> | 2016-12-21 09:59:54 +0300 |
|---|---|---|
| committer | James Johnston <james.johnston@thumbtack.com> | 2016-12-21 09:59:54 +0300 |
| commit | cac2895612ccb8adbf746534c2448e0592f77363 (patch) | |
| tree | 636d596df8cc015dcda09673dea20c5b36dbc5c1 /less | |
| parent | 63e9e06e8e20049d0cf63778069803651fc62e3f (diff) | |
Allow custom naming of font family
This allows multiple variations/versions of Font Awesome to be used,
similar to the namespacing currently allowed by the $fa-css-prefix
variable.
(And also allows us to more easily use a third-party library that makes
hard-coded non-default assumptions about the font face name.)
Diffstat (limited to 'less')
| -rw-r--r-- | less/core.less | 2 | ||||
| -rw-r--r-- | less/mixins.less | 2 | ||||
| -rw-r--r-- | less/path.less | 2 | ||||
| -rw-r--r-- | less/variables.less | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/less/core.less b/less/core.less index c577ac84a..462762260 100644 --- a/less/core.less +++ b/less/core.less @@ -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; diff --git a/less/mixins.less b/less/mixins.less index beef231d0..f0ebc0217 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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; diff --git a/less/path.less b/less/path.less index 835be41f8..2164ff303 100644 --- a/less/path.less +++ b/less/path.less @@ -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'), diff --git a/less/variables.less b/less/variables.less index 7ddbbc011..f467b64ea 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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; |