Skip to content

Commit 30b1655

Browse files
author
Stanislav Idolov
authored
ENGCOM-2010: [Forwardport] chore: prefer woff and woff2 #16155 
2 parents 6ad774d + 187dc9f commit 30b1655

25 files changed

+7
-796
lines changed

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,15 +1000,13 @@ fieldset[disabled] .pager .action-next {
10001000
}
10011001
@font-face {
10021002
font-family: 'icons-blank-theme';
1003-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1004-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');
1003+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10051004
font-weight: normal;
10061005
font-style: normal;
10071006
}
10081007
@font-face {
10091008
font-family: 'icons-blank-theme';
1010-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');
1011-
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype');
1009+
src: url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff2') format('woff2'), url('../fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff');
10121010
font-weight: normal;
10131011
font-style: normal;
10141012
}

‎lib/web/css/docs/source/_typography.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,8 @@
947947
// ) {
948948
// @font-face {
949949
// font-family: @family-name;
950-
// src: url('@{font-path}.eot');
951-
// src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
952-
// url('@{font-path}.woff2') format('woff2'),
953-
// url('@{font-path}.woff') format('woff'),
954-
// url('@{font-path}.ttf') format('truetype'),
955-
// url('@{font-path}.svg#@{family-name}') format('svg');
950+
// src: url('@{font-path}.woff2') format('woff2'),
951+
// url('@{font-path}.woff') format('woff');
956952
// font-weight: @font-weight;
957953
// font-style: @font-style;
958954
// }

‎lib/web/css/source/lib/_typography.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
) {
1616
@font-face {
1717
font-family: @family-name;
18-
src: url('@{font-path}.eot');
19-
src: url('@{font-path}.eot?#iefix') format('embedded-opentype'),
20-
url('@{font-path}.woff2') format('woff2'),
21-
url('@{font-path}.woff') format('woff'),
22-
url('@{font-path}.ttf') format('truetype'),
23-
url('@{font-path}.svg#@{family-name}') format('svg');
18+
src: url('@{font-path}.woff2') format('woff2'),
19+
url('@{font-path}.woff') format('woff');
2420
font-weight: @font-weight;
2521
font-style: @font-style;
2622
}

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot

-6.52 KB
Binary file not shown.

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf

-6.32 KB
Binary file not shown.

‎lib/web/fonts/MUI-Icons/MUI-Icons.eot

-18.9 KB
Binary file not shown.

‎lib/web/fonts/MUI-Icons/MUI-Icons.svg

Lines changed: 0 additions & 706 deletions
This file was deleted.

‎lib/web/fonts/MUI-Icons/MUI-Icons.ttf

-18.7 KB
Binary file not shown.

‎lib/web/fonts/UX-Icons/UX-Icons.eot

-9.5 KB
Binary file not shown.

‎lib/web/fonts/UX-Icons/UX-Icons.svg

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎lib/web/fonts/UX-Icons/UX-Icons.ttf

-9.34 KB
Binary file not shown.

‎lib/web/fonts/opensans/bold/opensans-700.eot

-19.1 KB
Binary file not shown.

‎lib/web/fonts/opensans/bold/opensans-700.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/opensans/bold/opensans-700.ttf

-37.6 KB
Binary file not shown.

‎lib/web/fonts/opensans/light/opensans-300.eot

-19.1 KB
Binary file not shown.

‎lib/web/fonts/opensans/light/opensans-300.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/opensans/light/opensans-300.ttf

-36.5 KB
Binary file not shown.

‎lib/web/fonts/opensans/regular/opensans-400.eot

-19.4 KB
Binary file not shown.

‎lib/web/fonts/opensans/regular/opensans-400.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/opensans/regular/opensans-400.ttf

-37.3 KB
Binary file not shown.

‎lib/web/fonts/opensans/semibold/opensans-600.eot

-19.6 KB
Binary file not shown.

‎lib/web/fonts/opensans/semibold/opensans-600.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/web/fonts/opensans/semibold/opensans-600.ttf

-38.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)