From c07ff136edc5473f8feb2e715a32c9aea43e55ea Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 11 Nov 2022 16:17:20 +0100 Subject: [PATCH] refs #3971 style fixes --- debian/changelog | 2 +- forms/admin/access-log/style.css | 2 +- forms/admin/photos/style.css | 2 +- forms/admin/visits/style.css | 2 +- forms/cms/about/style.css | 6 +++--- forms/cms/home/style.css | 4 ++-- forms/cms/location/style.css | 2 +- forms/ecomerce/basket/style.css | 9 ++++----- forms/ecomerce/catalog/style.css | 6 +++--- forms/ecomerce/checkout/style.css | 4 ++-- forms/ecomerce/ticket/style.css | 2 +- js/hedera/gui.scss | 4 ++-- js/hedera/report.css | 2 +- js/htk/image-editor/style.scss | 2 +- js/htk/popup/style.scss | 2 +- js/htk/style/responsive.scss | 4 +--- js/htk/style/style.scss | 4 ++-- package.json | 2 +- pages/production/style.css | 4 ++-- pages/version-menu/style.css | 4 ++-- 20 files changed, 33 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31131312..8953930e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (22.44.6) stable; urgency=low +hedera-web (22.44.7) stable; urgency=low * Initial Release. diff --git a/forms/admin/access-log/style.css b/forms/admin/access-log/style.css index b9edd1c4..17e52e14 100644 --- a/forms/admin/access-log/style.css +++ b/forms/admin/access-log/style.css @@ -1,6 +1,6 @@ .access-log .form > p { - font-size: 1.2em; + font-size: 1.2rem; margin: .1em 0; } diff --git a/forms/admin/photos/style.css b/forms/admin/photos/style.css index ca193e89..3dbdafad 100644 --- a/forms/admin/photos/style.css +++ b/forms/admin/photos/style.css @@ -76,6 +76,6 @@ text-align: center; } .photos .footer > button { - font-size: 1.2em; + font-size: 1.2rem; margin-left: 1em; } diff --git a/forms/admin/visits/style.css b/forms/admin/visits/style.css index e8dae95f..2808d3a1 100644 --- a/forms/admin/visits/style.css +++ b/forms/admin/visits/style.css @@ -6,7 +6,7 @@ margin-bottom: 0; } .visits .summary p { - font-size: 1.4em; + font-size: 1.4rem; margin: 0; text-align: right; } diff --git a/forms/cms/about/style.css b/forms/cms/about/style.css index 5290fa22..246230a2 100644 --- a/forms/cms/about/style.css +++ b/forms/cms/about/style.css @@ -31,17 +31,17 @@ padding: 0; margin: 0; font-weight: normal; - font-size: 1.6em; + font-size: 1.6rem; } .about h2 { text-align: center; - font-size: 1.2em; + font-size: 1.2rem; font-weight: normal; margin: 1em; } .about h3 { text-align: center; - font-size: 1.2em; + font-size: 1.2rem; font-weight: normal; padding: 1em; color: #00796B; diff --git a/forms/cms/home/style.css b/forms/cms/home/style.css index a38f59a4..2093251d 100644 --- a/forms/cms/home/style.css +++ b/forms/cms/home/style.css @@ -33,14 +33,14 @@ padding-bottom: 1px; } .new h2 { - font-size: 1.6em; + font-size: 1.6rem; color: black; font-weight: normal; padding: 0; } .new-info { - font-size: 0.9em; + font-size: 0.9rem; color: #444; text-align: right; margin: .8em 0; diff --git a/forms/cms/location/style.css b/forms/cms/location/style.css index d002a329..a5dcdab6 100644 --- a/forms/cms/location/style.css +++ b/forms/cms/location/style.css @@ -7,7 +7,7 @@ div.marker h3 { - font-size: 1.3em; + font-size: 1.3rem; } div.marker p { diff --git a/forms/ecomerce/basket/style.css b/forms/ecomerce/basket/style.css index 2daf2024..c353f292 100644 --- a/forms/ecomerce/basket/style.css +++ b/forms/ecomerce/basket/style.css @@ -6,12 +6,12 @@ font-weight: bold; margin: 0; padding: 0; - font-size: 1.4em; + font-size: 1.4rem; text-align: right; } .basket .form > p { margin: 0; - font-size: 1.4em; + font-size: 1.4rem; color: white; text-align: right; } @@ -47,10 +47,9 @@ overflow: hidden; } .basket .line > .info > h2 { - font-size: 1em; + font-size: 1rem; font-weight: normal; - padding: 0; - padding-bottom: .1em; + margin-bottom: 2px; } .basket .line > .info > p { margin: 0; diff --git a/forms/ecomerce/catalog/style.css b/forms/ecomerce/catalog/style.css index 5dbac641..84702861 100644 --- a/forms/ecomerce/catalog/style.css +++ b/forms/ecomerce/catalog/style.css @@ -71,7 +71,7 @@ .right-panel h2 { font-weight: normal; color: #777; - font-size: 1.1em; + font-size: 1.1rem; } .right-panel .realms > div > div { text-align: center; @@ -120,7 +120,7 @@ padding: 0; margin-bottom: .15em; font-weight: normal; - font-size: 1em; + font-size: 1rem; text-overflow: ellipsis; overflow: hidden; max-height: 3em; @@ -389,7 +389,7 @@ margin-right: 0; } } -@media (max-width: 515px) { +@media (max-width: 650px) { .grid-view .item-box { width: 100%; max-width: 450px; diff --git a/forms/ecomerce/checkout/style.css b/forms/ecomerce/checkout/style.css index 61885aad..cb95cfab 100644 --- a/forms/ecomerce/checkout/style.css +++ b/forms/ecomerce/checkout/style.css @@ -8,12 +8,12 @@ .answers button, .answers p, .radio > div { - font-size: 1.2em; + font-size: 1.2rem; } .answers .htk-select { max-width: 15em; margin: 0 auto; - font-size: 1.4em; + font-size: 1.4rem; } .answers p { margin: 0.3em 0; diff --git a/forms/ecomerce/ticket/style.css b/forms/ecomerce/ticket/style.css index 76aed3ac..ddb317b0 100644 --- a/forms/ecomerce/ticket/style.css +++ b/forms/ecomerce/ticket/style.css @@ -50,7 +50,7 @@ flex: 1; } .ticket .line > .info > h2 { - font-size: 1em; + font-size: 1rem; font-weight: normal; padding: 0; padding-bottom: .1em; diff --git a/js/hedera/gui.scss b/js/hedera/gui.scss index e78c9721..6ee4f165 100644 --- a/js/hedera/gui.scss +++ b/js/hedera/gui.scss @@ -11,7 +11,7 @@ $navbar-height: 64px; .user-name, .menu-title { - font-size: 1.1em; + font-size: 1.1rem; } /* Navigation bar */ @@ -58,7 +58,7 @@ $navbar-height: 64px; h1 { font-weight: normal; - font-size: 1.4em; + font-size: 1.4rem; margin: 0; white-space: nowrap; text-overflow: ellipsis; diff --git a/js/hedera/report.css b/js/hedera/report.css index 2fd9b179..eba80e3f 100644 --- a/js/hedera/report.css +++ b/js/hedera/report.css @@ -56,7 +56,7 @@ z-index: 100; border: none; cursor: pointer; - font-size: 1.15em; + font-size: 1.15rem; height: 100%; padding: 0 1em; } diff --git a/js/htk/image-editor/style.scss b/js/htk/image-editor/style.scss index 22921146..e2d6f285 100644 --- a/js/htk/image-editor/style.scss +++ b/js/htk/image-editor/style.scss @@ -8,7 +8,7 @@ color: white; background-color: #009688; text-align: left; - font-size: 1.3em; + font-size: 1.3rem; line-height: 1.7em; font-weight: normal; padding: 0.6em 0.8em; diff --git a/js/htk/popup/style.scss b/js/htk/popup/style.scss index 696d1a71..d67f3e7b 100644 --- a/js/htk/popup/style.scss +++ b/js/htk/popup/style.scss @@ -11,7 +11,7 @@ &.modal { position: relative; - font-size: 1.2em; + font-size: 1.2rem; max-width: 100%; max-height: 100%; } diff --git a/js/htk/style/responsive.scss b/js/htk/style/responsive.scss index 2454e214..21bd609d 100644 --- a/js/htk/style/responsive.scss +++ b/js/htk/style/responsive.scss @@ -3,9 +3,7 @@ /* Responsive */ /* Standard */ -@media screen { - body { font-size: 14px; } -} +body { font-size: 14px; } /* Desktop - Laptop 1360x768 */ @media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px) { diff --git a/js/htk/style/style.scss b/js/htk/style/style.scss index 801b8cc6..e0b52c80 100644 --- a/js/htk/style/style.scss +++ b/js/htk/style/style.scss @@ -153,7 +153,7 @@ option { padding: .4em; border-width: 0; font-weight: normal; - font-size: 1em; + font-size: 1rem; } select, option { @@ -218,7 +218,7 @@ img.editable { & > h1 { color: white; text-align: left; - font-size: 1.6em; + font-size: 1.6rem; line-height: 2em; font-weight: normal; display: inline; diff --git a/package.json b/package.json index 8a16fbc0..be1d3f0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "22.44.6", + "version": "22.44.7", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/pages/production/style.css b/pages/production/style.css index bc8beb90..4ea43f15 100644 --- a/pages/production/style.css +++ b/pages/production/style.css @@ -36,7 +36,7 @@ body.done #text { color: white; - font-size: 24em; + font-size: 24rem; font-weight: bold; text-align: center; white-space: nowrap; @@ -46,7 +46,7 @@ body.done #error { color: red; - font-size: 3em; + font-size: 3rem; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/pages/version-menu/style.css b/pages/version-menu/style.css index 1d4bf26c..38b69776 100644 --- a/pages/version-menu/style.css +++ b/pages/version-menu/style.css @@ -58,7 +58,7 @@ body } h1 { - font-size: 2.5em; + font-size: 2.5rem; font-weight: normal; margin: 1.2em 1em; padding: 0; @@ -71,7 +71,7 @@ img p { text-align: center; - font-size: 1.6em; + font-size: 1.6rem; margin: 0; } a