IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(fonts): move icon fonts back to main css

Browse Source
This commit is contained in:
bergquist 2016-03-16 14:45:39 +01:00
parent 9d3cbfe896
commit aadc6e0bbd
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/sass/_grafana.scss
View File

@ -16,6 +16,7 @@
@import "base/forms";
@import "base/grid";
@import "base/font_awesome";
@import "base/grafana_icons";
// UTILS
@import "utils/utils";

24
public/sass/base/_fonts.scss
View File

@ -1,3 +1,27 @@
/* icon fonts
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'grafana-icons';
src: url('../fonts/grafana-icons.eot?h6rv8b');
src: url('../fonts/grafana-icons.eot?h6rv8b#iefix') format('embedded-opentype'),
url('../fonts/grafana-icons.ttf?h6rv8b') format('truetype'),
url('../fonts/grafana-icons.woff?h6rv8b') format('woff'),
url('../fonts/grafana-icons.svg?h6rv8b#grafana-icons') format('svg');
font-weight: normal;
font-style: normal;
}*/
/* Open sans fonts*/
/* cyrillic-ext */
@font-face {
font-family: 'Open Sans';

2
public/sass/fonts.scss
View File

@ -1,3 +1 @@
@import "base/fonts";
@import "base/font_awesome";
@import "base/grafana_icons";