Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fontsdir #193

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fontsdir #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308f8af
Renamed font folder to fonts to be consistent with other font package…
lothat Feb 24, 2017
337b644
Merge remote-tracking branch 'upstream/master' into fontsdir
lothat Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _docs/gh-pages/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8837,8 +8837,8 @@ h2 {
}
.icon {
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');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weathericons-regular-webfontRg') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
4 changes: 2 additions & 2 deletions _docs/gh-pages/css/weather-icons-wind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@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.woff2') format('woff2'), url('../font/weathericons-regular-webfont.woff') format('woff'), url('../font/weathericons-regular-webfont.ttf') format('truetype'), url('../font/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff2') format('woff2'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion _docs/gh-pages/css/weather-icons-wind.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _docs/gh-pages/css/weather-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
@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.woff2') format('woff2'), url('../font/weathericons-regular-webfont.woff') format('woff'), url('../font/weathericons-regular-webfont.ttf') format('truetype'), url('../font/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff2') format('woff2'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion _docs/gh-pages/css/weather-icons.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _docs/less/cheatsheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ h2 {
}
.icon {
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');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weathericons-regular-webfontRg') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
3 changes: 0 additions & 3 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
"license": "MIT",
"main": [
"./css/weather-icons.css",
"./css/weather-icons.min.css",
"./css/weather-icons-wind.css",
"./css/weather-icons-wind.min.css",
"./font/*",
"./less/weather-icons.less",
"./sass/weather-icons.scss"
],
Expand Down
4 changes: 2 additions & 2 deletions css/weather-icons-wind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@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.woff2') format('woff2'), url('../font/weathericons-regular-webfont.woff') format('woff'), url('../font/weathericons-regular-webfont.ttf') format('truetype'), url('../font/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff2') format('woff2'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion css/weather-icons-wind.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/weather-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
@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.woff2') format('woff2'), url('../font/weathericons-regular-webfont.woff') format('woff'), url('../font/weathericons-regular-webfont.ttf') format('truetype'), url('../font/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
src: url('../fonts/weathericons-regular-webfont.eot');
src: url('../fonts/weathericons-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/weathericons-regular-webfont.woff2') format('woff2'), url('../fonts/weathericons-regular-webfont.woff') format('woff'), url('../fonts/weathericons-regular-webfont.ttf') format('truetype'), url('../fonts/weathericons-regular-webfont.svg#weather_iconsregular') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion css/weather-icons.min.css
View file
Open in desktop

Large diffs are not rendered by default.

0 font/weathericons-regular-webfont.eot → fonts/weathericons-regular-webfont.eot
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 font/weathericons-regular-webfont.svg → fonts/weathericons-regular-webfont.svg
100755 → 100644
View file
Open in desktop
File renamed without changes
0 font/weathericons-regular-webfont.ttf → fonts/weathericons-regular-webfont.ttf
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 font/weathericons-regular-webfont.woff → fonts/weathericons-regular-webfont.woff
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 font/weathericons-regular-webfont.woff2 → fonts/weathericons-regular-webfont.woff2
100755 → 100644
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion less/weather-icons-core.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Base Variables
@wi-path: "../font";
@wi-path: "../fonts";
@wi-version: "2.0";
@wi-css-prefix: wi;
@wi-font-family: weathericons;
Expand Down
2 changes: 1 addition & 1 deletion sass/weather-icons-core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Base Variables
$wi-path: "../font" !default;
$wi-path: "../fonts" !default;
$wi-version: "2.0" !default;
$wi-css-prefix: wi !default;
$wi-font-family: weathericons !default;
Expand Down