diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.eot
deleted file mode 100644
index d41103b2a9..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.ttf
deleted file mode 100644
index 45c55e4e2e..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Black.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.eot
deleted file mode 100644
index 74ea6229ba..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.ttf
deleted file mode 100644
index 76563c22f8..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BlackItalic.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.eot
deleted file mode 100644
index d90b47b81e..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.ttf
deleted file mode 100644
index c598c24a3d..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Bold.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.eot
deleted file mode 100644
index 17216efe59..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.ttf
deleted file mode 100644
index c1f225af19..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-BoldItalic.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.eot
deleted file mode 100644
index 403b9a5bd3..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.ttf
deleted file mode 100644
index c61fc07cab..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Italic.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.eot
deleted file mode 100644
index 865537d94f..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.ttf
deleted file mode 100644
index 6af1b85dfd..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Light.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.eot
deleted file mode 100644
index 52ee50c857..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.ttf
deleted file mode 100644
index b8810365ec..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-LightItalic.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.eot
deleted file mode 100644
index 96a9035981..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.ttf
deleted file mode 100644
index bcc57780d8..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/lato/LatoLatin-Regular.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.eot
deleted file mode 100644
index 6bbc3cf58c..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.svg b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.svg
deleted file mode 100644
index 25a3952340..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.svg
+++ /dev/null
@@ -1,1831 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.ttf
deleted file mode 100644
index c537f8382a..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.woff
deleted file mode 100644
index e231183dce..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular-webfont.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf
deleted file mode 100644
index db433349b7..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff
new file mode 100644
index 0000000000..e495e6f010
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff2
new file mode 100644
index 0000000000..c8050c25f8
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff2 differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.eot
deleted file mode 100644
index d8375dd0ab..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.eot and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.svg b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.svg
deleted file mode 100644
index eec4db8bd7..0000000000
--- a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.svg
+++ /dev/null
@@ -1,1830 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.ttf
deleted file mode 100644
index b3290843a7..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.ttf and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.woff
deleted file mode 100644
index 28d6adee03..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold-webfont.woff and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff
new file mode 100644
index 0000000000..5a604b3a01
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff differ
diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff2 b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff2
new file mode 100644
index 0000000000..a0965b7a89
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.woff2 differ
diff --git a/src/Umbraco.Web.UI.Client/src/less/fonts.less b/src/Umbraco.Web.UI.Client/src/less/fonts.less
index 613794d1bf..8c40bc4ec9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/fonts.less
+++ b/src/Umbraco.Web.UI.Client/src/less/fonts.less
@@ -7,15 +7,19 @@
Black: font-weight: 900;
*/
+@fontPath: '../fonts';
+@latoPath: '@{fontPath}/lato';
+@openSansPath: '@{fontPath}/opensans';
+
/* Webfont: LatoLatin-Black */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-Black.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-Black.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-Black.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Black.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Black.ttf') format('truetype');
+ src: local('LatoLatin Black'),
+ local('LatoLatin-Black'),
+ url('@{latoPath}/LatoLatin-Black.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-Black.woff') format('woff'); /* Modern Browsers */
font-style: normal;
+ font-display: swap;
font-weight: 900;
text-rendering: optimizeLegibility;
}
@@ -23,91 +27,91 @@
/* Webfont: LatoLatin-BlackItalic */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-BlackItalic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-BlackItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-BlackItalic.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-BlackItalic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-BlackItalic.ttf') format('truetype');
+ src: local('LatoLatin BlackItalic'),
+ local('LatoLatin-BlackItalic'),
+ url('@{latoPath}/LatoLatin-BlackItalic.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-BlackItalic.woff') format('woff'); /* Modern Browsers */
font-style: italic;
font-weight: 900;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-Bold */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-Bold.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-Bold.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Bold.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Bold.ttf') format('truetype');
+ src: local('LatoLatin Bold'),
+ local('LatoLatin-Bold'),
+ url('@{latoPath}/LatoLatin-Bold.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-Bold.woff') format('woff'); /* Modern Browsers */
font-style: normal;
- font-weight: bold;
+ font-weight: 700;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-BoldItalic */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-BoldItalic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-BoldItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-BoldItalic.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-BoldItalic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-BoldItalic.ttf') format('truetype');
+ src: local('LatoLatin BoldItalic'),
+ local('LatoLatin-BoldItalic'),
+ url('@{latoPath}/LatoLatin-BoldItalic.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-BoldItalic.woff') format('woff'); /* Modern Browsers */
font-style: italic;
- font-weight: bold;
+ font-weight: 700;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-Italic */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-Italic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-Italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-Italic.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Italic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Italic.ttf') format('truetype');
+ src: local('LatoLatin Italic'),
+ local('LatoLatin-Italic'),
+ url('@{latoPath}/LatoLatin-Italic.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-Italic.woff') format('woff'); /* Modern Browsers */
font-style: italic;
- font-weight: normal;
+ font-weight: 400;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-Regular */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-Regular.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-Regular.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Regular.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Regular.ttf') format('truetype');
+ src: local('LatoLatin Regular'),
+ local('LatoLatin-Regular'),
+ url('@{latoPath}/LatoLatin-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-Regular.woff') format('woff'); /* Modern Browsers */
font-style: normal;
- font-weight: normal;
+ font-weight: 400;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-Light */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-Light.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-Light.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-Light.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Light.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-Light.ttf') format('truetype');
+ src: local('LatoLatin Light'),
+ local('LatoLatin-Light'),
+ url('@{latoPath}/LatoLatin-Light.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-Light.woff') format('woff'); /* Modern Browsers */
font-style: normal;
font-weight: 300;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
/* Webfont: LatoLatin-LightItalic */
@font-face {
font-family: 'Lato';
- src: url('../fonts/lato/LatoLatin-LightItalic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/lato/LatoLatin-LightItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- //url('../fonts/lato/LatoLatin-LightItalic.woff2') format('woff2'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-LightItalic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/lato/LatoLatin-LightItalic.ttf') format('truetype');
+ src: local('LatoLatin LightItalic'),
+ local('LatoLatin-LightItalic'),
+ url('@{latoPath}/LatoLatin-LightItalic.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{latoPath}/LatoLatin-LightItalic.woff') format('woff'); /* Modern Browsers */
font-style: italic;
font-weight: 300;
+ font-display: swap;
text-rendering: optimizeLegibility;
}
@@ -122,24 +126,22 @@
@font-face {
font-family: 'Open Sans';
- src: url('../fonts/opensans/OpenSans-Regular-webfont.eot');
- src: local('Open Sans'), local('OpenSans'),
- url('../fonts/opensans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('../fonts/opensans/OpenSans-Regular-webfont.ttf') format('truetype'),
- url('../fonts/opensans/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
+ src: local('Open Sans'),
+ local('OpenSans'),
+ url('@{openSansPath}/OpenSans-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{openSansPath}/OpenSans-Regular.woff') format('woff'); /* Modern Browsers */
font-weight: 400;
+ font-display: swap;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
- src: url('../fonts/opensans/OpenSans-Semibold-webfont.eot');
- src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
- url('../fonts/opensans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
- url('../fonts/opensans/OpenSans-Semibold-webfont.ttf') format('truetype'),
- url('../fonts/opensans/OpenSans-Semibold-webfont.svg#open_sanssemibold') format('svg');
+ src: local('Open Sans'),
+ local('OpenSans'),
+ url('@{openSansPath}/OpenSans-Semibold.woff2') format('woff2'), /* Super Modern Browsers */
+ url('@{openSansPath}/OpenSans-Semibold.woff') format('woff'); /* Modern Browsers */
font-weight: 600;
+ font-display: swap;
font-style: normal;
}
-
-