From ac68485e918f81e1a7282ed3a80e6b3733bb5280 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Wed, 8 Aug 2018 16:19:18 +0200 Subject: [PATCH] Fixed issue #13929: Italic text in admin shown with a serif font --- assets/fonts/roboto.css | 16 ++++++------ .../adminbasics/css/lime-admin-common.css | 25 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/assets/fonts/roboto.css b/assets/fonts/roboto.css index a663dc887b8..7151af38bf5 100644 --- a/assets/fonts/roboto.css +++ b/assets/fonts/roboto.css @@ -114,14 +114,14 @@ font-family: 'Roboto'; font-weight: 400; font-style: italic; - src: url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.eot'); - src: url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Italic'), - local('Roboto-italic'), - url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.woff2') format('woff2'), - url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.woff') format('woff'), - url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.ttf') format('truetype'), - url('./font-src/roboto-v18-latin_latin-ext/Roboto-italic.svg#Roboto') format('svg'); + src: url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.eot'); + src: url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.eot?#iefix') format('embedded-opentype'), + local('Roboto Light Italic'), + local('Roboto-300italic'), + url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.woff2') format('woff2'), + url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.woff') format('woff'), + url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.ttf') format('truetype'), + url('./font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.svg#Roboto') format('svg'); } @font-face { diff --git a/assets/packages/adminbasics/css/lime-admin-common.css b/assets/packages/adminbasics/css/lime-admin-common.css index dcd19290bbf..6ab896eb9d4 100644 --- a/assets/packages/adminbasics/css/lime-admin-common.css +++ b/assets/packages/adminbasics/css/lime-admin-common.css @@ -218,6 +218,7 @@ body { html { font-family: Roboto; + font-weight: 400; position: relative; min-height: 100%; } @@ -1493,13 +1494,13 @@ h3 .glyphicon-chevron-up, h3 .glyphicon-chevron-down, h3 .glyphicon-chevron-righ margin: 1em 0 1em 0; } #systemoverview .info div { - font-size: 14px; - margin-top: 10px; - margin-bottom: 10px; - font-weight: 500; - line-height: 1.1; - color: inherit; - text-align: center; + font-size: 14px; + margin-top: 10px; + margin-bottom: 10px; + font-weight: 500; + line-height: 1.1; + color: inherit; + text-align: center; } /** @@ -2238,7 +2239,7 @@ table#responsedetail tr td{ } .welcome .panel-title { - font-weight: 500; + font-weight: 500; } .welcome .panel-body { @@ -2331,7 +2332,7 @@ input[type="file"].form-control { left: -1000px; top: -1000px; margin: 0 !important; - width: 0px !important; + width: 0px !important; } body.onStatistics div.row { @@ -2356,8 +2357,8 @@ input[type="file"].form-control { min-height: 29.7cm !important; height: 100% !important; overflow: visible; - page-break-inside: auto; - break-inside: auto; + page-break-inside: auto; + break-inside: auto; } body.onStatistics #statisticsview div, body.onStatistics #statisticsview table { @@ -2409,7 +2410,7 @@ input[type="file"].form-control { padding: 0 !important; } body.onStatistics div.printable table{ - position: static; + position: static; page-break-inside : avoid; break-inside : avoid; margin-left: 0 !important;