From ec40ba1c1ff258bfe24bc5e7b024cf2e6eaed810 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Mon, 22 Aug 2016 19:25:00 +0200 Subject: Set correct font family and font weight in lato.css All fonts belong to the same font family, i.e. Late. Set the correct font weights obtained from the download page of the font website. Test-Information: Verified in Web Inspector that all fonts are loaded. Previously only two fonts were loaded. Change-Id: Ifa0a01058d80c1ddf3c500a28bd3e50823eb4246 diff --git a/Swift/resources/themes/Default/lato.css b/Swift/resources/themes/Default/lato.css index e081767..c8bc47a 100644 --- a/Swift/resources/themes/Default/lato.css +++ b/Swift/resources/themes/Default/lato.css @@ -1,64 +1,56 @@ @font-face { - font-family: 'LatoBlack'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Black.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Hairline.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 100; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoBlack'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-BlackItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-HairlineItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 100; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoBold'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Bold.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Thin.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 200; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoBold'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-BoldItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-ThinItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 200; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoHairline'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Hairline.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Light.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 300; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoHairline'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-HairlineItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-LightItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 300; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoHeavy'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Heavy.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Regular.ttf') format('truetype'); font-style: normal; - font-weight: normal; - text-rendering: optimizeLegibility; -} - -@font-face { - font-family: 'LatoHeavy'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-HeavyItalic.ttf') format('truetype'); - font-style: italic; - font-weight: normal; + font-weight: 400; text-rendering: optimizeLegibility; } @@ -66,79 +58,86 @@ font-family: 'Lato'; src: url('qrc:///themes/Default/Lato2OFL/Lato-Italic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 400; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoLight'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Light.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Medium.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 500; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoLight'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-LightItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-MediumItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 500; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoMedium'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Medium.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Semibold.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 600; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoMedium'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-MediumItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-SemiboldItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 600; text-rendering: optimizeLegibility; } @font-face { font-family: 'Lato'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Regular.ttf') format('truetype'); + src: url('qrc:///themes/Default/Lato2OFL/Lato-Bold.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 700; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoSemibold'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Semibold.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-BoldItalic.ttf') format('truetype'); + font-style: italic; + font-weight: 700; + text-rendering: optimizeLegibility; +} + +@font-face { + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Heavy.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 800; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoSemibold'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-SemiboldItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-HeavyItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 800; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoThin'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-Thin.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-Black.ttf') format('truetype'); font-style: normal; - font-weight: normal; + font-weight: 900; text-rendering: optimizeLegibility; } @font-face { - font-family: 'LatoThin'; - src: url('qrc:///themes/Default/Lato2OFL/Lato-ThinItalic.ttf') format('truetype'); + font-family: 'Lato'; + src: url('qrc:///themes/Default/Lato2OFL/Lato-BlackItalic.ttf') format('truetype'); font-style: italic; - font-weight: normal; + font-weight: 900; text-rendering: optimizeLegibility; } - -- cgit v0.10.2-6-g49f6