Skip to content

Commit 1af6082

Browse files
author
Oleg Zinoviev
committed
MAGETWO-31855: UI improvements
- woff2 fonts support
1 parent 1207ec9 commit 1af6082

File tree

8 files changed

+12
-2
lines changed

8 files changed

+12
-2
lines changed

app/design/adminhtml/Magento/backend/web/less/clearless/typography.less

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
@font-face {
2020
font-family: @family-name;
2121
src: url('@{font-path}.eot');
22-
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'), url('@{font-path}.woff') format('woff'), url('@{font-path}.ttf') format('truetype');
22+
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
23+
url('@{font-path}.woff2') format('woff2'),
24+
url('@{font-path}.woff') format('woff'),
25+
url('@{font-path}.ttf') format('truetype');
2326
font-weight: @font-weight;
2427
font-style: @font-style;
2528
}
@@ -29,7 +32,11 @@
2932
@font-face {
3033
font-family: @family-name;
3134
src: url('@{font-path}.eot');
32-
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'), url('@{font-path}.woff') format('woff'), url('@{font-path}.ttf') format('truetype'), url('@{font-path}.svg#@{family-name}') format('svg');
35+
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
36+
url('@{font-path}.woff2') format('woff2'),
37+
url('@{font-path}.woff') format('woff'),
38+
url('@{font-path}.ttf') format('truetype'),
39+
url('@{font-path}.svg#@{family-name}') format('svg');
3340
font-weight: @font-weight;
3441
font-style: @font-style;
3542
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

lib/web/css/docs/source/typography.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,7 @@
948948
// font-family: @family-name;
949949
// src: url('@{font-path}.eot');
950950
// src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
951+
// url('@{font-path}.woff2') format('woff2'),
951952
// url('@{font-path}.woff') format('woff'),
952953
// url('@{font-path}.ttf') format('truetype'),
953954
// url('@{font-path}.svg#@{family-name}') format('svg');

lib/web/css/docs/typography.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,7 @@
913913
font-family: @family-name;
914914
src: url('@{font-path}.eot');
915915
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
916+
url('@{font-path}.woff2') format('woff2'),
916917
url('@{font-path}.woff') format('woff'),
917918
url('@{font-path}.ttf') format('truetype'),
918919
url('@{font-path}.svg#@{family-name}') format('svg');

lib/web/css/source/lib/typography.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
font-family: @family-name;
1313
src: url('@{font-path}.eot');
1414
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
15+
url('@{font-path}.woff2') format('woff2'),
1516
url('@{font-path}.woff') format('woff'),
1617
url('@{font-path}.ttf') format('truetype'),
1718
url('@{font-path}.svg#@{family-name}') format('svg');

0 commit comments

Comments
 (0)