From 71d241adceb67ab80e164f7ecd6789047aef9461 Mon Sep 17 00:00:00 2001 From: Dave Gandy Date: Sun, 24 Aug 2014 11:08:03 -0500 Subject: [PATCH] refactoring base css fa declaration into an jekyll include to reduce code duplication --- src/_includes/code/core.css | 6 ++++++ src/_includes/code/{license.txt => license.css} | 0 src/assets/font-awesome/less/core.less | 7 +------ src/assets/font-awesome/less/font-awesome.less | 2 +- src/assets/font-awesome/scss/_core.scss | 7 +------ src/assets/font-awesome/scss/font-awesome.scss | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 src/_includes/code/core.css rename src/_includes/code/{license.txt => license.css} (100%) diff --git a/src/_includes/code/core.css b/src/_includes/code/core.css new file mode 100644 index 000000000..5294d52e8 --- /dev/null +++ b/src/_includes/code/core.css @@ -0,0 +1,6 @@ + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; // 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; + -moz-osx-font-smoothing: grayscale; \ No newline at end of file diff --git a/src/_includes/code/license.txt b/src/_includes/code/license.css similarity index 100% rename from src/_includes/code/license.txt rename to src/_includes/code/license.css diff --git a/src/assets/font-awesome/less/core.less b/src/assets/font-awesome/less/core.less index cfca76f78..c13c937ef 100644 --- a/src/assets/font-awesome/less/core.less +++ b/src/assets/font-awesome/less/core.less @@ -5,10 +5,5 @@ // ------------------------- .@{fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // 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; - -moz-osx-font-smoothing: grayscale; +{% include code/core.css %} } diff --git a/src/assets/font-awesome/less/font-awesome.less b/src/assets/font-awesome/less/font-awesome.less index 96f2d2dc3..619d86a10 100644 --- a/src/assets/font-awesome/less/font-awesome.less +++ b/src/assets/font-awesome/less/font-awesome.less @@ -1,6 +1,6 @@ --- --- -{% include code/license.txt %} +{% include code/license.css %} @import "variables.less"; @import "mixins.less"; diff --git a/src/assets/font-awesome/scss/_core.scss b/src/assets/font-awesome/scss/_core.scss index c6e8e1854..1de151546 100644 --- a/src/assets/font-awesome/scss/_core.scss +++ b/src/assets/font-awesome/scss/_core.scss @@ -5,10 +5,5 @@ // ------------------------- .#{$fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // 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; - -moz-osx-font-smoothing: grayscale; +{% include code/core.css %} } diff --git a/src/assets/font-awesome/scss/font-awesome.scss b/src/assets/font-awesome/scss/font-awesome.scss index 5fdef4e16..9374dee18 100644 --- a/src/assets/font-awesome/scss/font-awesome.scss +++ b/src/assets/font-awesome/scss/font-awesome.scss @@ -1,6 +1,6 @@ --- --- -{% include code/license.txt %} +{% include code/license.css %} @import "variables"; @import "mixins";