From 2e53f34540f270be2be583800cf242fb1e094533 Mon Sep 17 00:00:00 2001 From: Erik Flowers Date: Fri, 31 Jul 2015 11:14:52 -0700 Subject: [PATCH] putting variables in other file --- css/weather-icons-sass.css | 8 ++++---- less/weather-icons-classes.less | 6 ++++++ less/weather-icons-variables.less | 8 -------- sass/weather-icons-classes.scss | 6 ++++++ sass/weather-icons-variables.scss | 8 -------- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/css/weather-icons-sass.css b/css/weather-icons-sass.css index 3664810..1ac3047 100644 --- a/css/weather-icons-sass.css +++ b/css/weather-icons-sass.css @@ -24,14 +24,14 @@ * Twitter: http://twitter.com/Erik_UX */ @font-face { - font-family: "weathericons"; - src: url("../font/weathericons-regular-webfont.eot"); - src: url("../font/weathericons-regular-webfont.eot?#iefix") format("embedded-opentype"), url("../font/weathericons-regular-webfont.woff") format("woff"), url("../font/weathericons-regular-webfont.ttf") format("truetype"), url("../font/weathericons-regular-webfont.svg#weathericons-regular-webfontRg") format("svg"); + font-family: "weatherasdfasdficons"; + src: url("../font/weatherasdfasdficons-regular-webfont.eot"); + src: url("../font/weatherasdfasdficons-regular-webfont.eot?#iefix") format("embedded-opentype"), url("../font/weatherasdfasdficons-regular-webfont.woff") format("woff"), url("../font/weatherasdfasdficons-regular-webfont.ttf") format("truetype"), url("../font/weatherasdfasdficons-regular-webfont.svg#weathericons-regular-webfontRg") format("svg"); font-weight: normal; font-style: normal; } .wi { display: inline-block; - font-family: "weathericons"; + font-family: "weatherasdfasdficons"; font-style: normal; font-weight: normal; line-height: 1; diff --git a/less/weather-icons-classes.less b/less/weather-icons-classes.less index 41b7570..7069662 100644 --- a/less/weather-icons-classes.less +++ b/less/weather-icons-classes.less @@ -1,3 +1,9 @@ +// Base Variables +@wi-path: "../font"; +@wi-version: "2.0"; +@wi-css-prefix: wi; +@wi-font-family: weathericons; + @font-face { font-family: '@{wi-font-family}'; src: url('@{wi-path}/@{wi-font-family}-regular-webfont.eot'); diff --git a/less/weather-icons-variables.less b/less/weather-icons-variables.less index 70335b8..5caae61 100644 --- a/less/weather-icons-variables.less +++ b/less/weather-icons-variables.less @@ -1,11 +1,3 @@ -// Base Variables -@wi-path: "../font"; -@wi-version: "2.0"; -@wi-css-prefix: wi; -@wi-font-family: weathericons; - -//Glyph Names - @wi-icon-glyphs: "_reserved_" "\f049", "alien" "\f075", diff --git a/sass/weather-icons-classes.scss b/sass/weather-icons-classes.scss index 596188e..19ee4e7 100644 --- a/sass/weather-icons-classes.scss +++ b/sass/weather-icons-classes.scss @@ -1,3 +1,9 @@ +//Base Variables +$wi-path: "../font"; +$wi-version: "2.0"; +$wi-css-prefix: wi; +$wi-font-family: weatherasdfasdficons; + @font-face { font-family: '#{$wi-font-family}'; src: url('#{$wi-path}/#{$wi-font-family}-regular-webfont.eot'); diff --git a/sass/weather-icons-variables.scss b/sass/weather-icons-variables.scss index 0dcfa45..337ccf3 100644 --- a/sass/weather-icons-variables.scss +++ b/sass/weather-icons-variables.scss @@ -1,11 +1,3 @@ -//Base Variables -$wi-path: "../font"; -$wi-version: "2.0"; -$wi-css-prefix: wi; -$wi-font-family: weathericons; - -//Glyph Names - $wi-icon-glyphs: ( "day-cloudy-gusts": "\f000", "day-cloudy-windy": "\f001",