Skip to content

Commit

Permalink
[Frontend] Renaming symbols font files
Browse files Browse the repository at this point in the history
Fixes #1047
- Modified sass to point to renamed font files;
- Added new 12px symbols font files to sass;
  • Loading branch information
charlesh88 committed Jun 22, 2016
1 parent 22a51d6 commit 47bd403
Showing 1 changed file with 22 additions and 6 deletions.
28 changes: 22 additions & 6 deletions platform/commonUI/general/res/sass/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,34 @@
/************************** FONTS */
@font-face {
/*
* Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
* Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json
* to generate font files
*/
font-family: 'symbolsfont';
src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot');
src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'),
url($dirCommonRes + 'fonts/symbols/wtdsymbols.woff') format('woff'),
url($dirCommonRes + 'fonts/symbols/wtdsymbols.ttf') format('truetype'),
url($dirCommonRes + 'fonts/symbols/wtdsymbols.svg#armataregular') format('svg');
src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot');
src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot?#iefix') format('embedded-opentype'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.woff') format('woff'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.ttf') format('truetype'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.svg') format('svg');
font-weight: normal;
font-style: normal;
}

@font-face {
/*
* Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json
* to generate font files
*/
font-family: 'symbolsfont 12px';
src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot');
src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot?#iefix') format('embedded-opentype'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.woff') format('woff'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.ttf') format('truetype'),
url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.svg') format('svg');
font-weight: normal;
font-style: normal;
}

/************************** HTML ENTITIES */
a {
color: $colorA;
Expand Down

0 comments on commit 47bd403

Please sign in to comment.