From b373c185d5f30e26be4d29021eba6ccd906bc716 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler Date: Tue, 19 Mar 2019 15:25:06 +0100 Subject: [PATCH] changed font-size to a relative one --- resources/less/metager/general/general.less | 28 +++++++------ resources/less/metager/general/specific.less | 2 +- resources/less/metager/pages/contact.less | 2 +- resources/less/metager/pages/donation.less | 2 +- resources/less/metager/pages/help_faq.less | 2 +- .../metager/pages/resultpage/product.less | 12 +----- .../metager/pages/resultpage/result-page.less | 12 +++--- .../less/metager/pages/resultpage/result.less | 40 ++++++++++--------- resources/less/metager/pages/start-page.less | 8 ++-- resources/less/metager/pages/widget.less | 4 +- resources/less/metager/parts/searchbar.less | 6 +-- resources/less/metager/parts/sidebar.less | 6 +-- resources/views/layouts/ad.blade.php | 2 +- 13 files changed, 62 insertions(+), 64 deletions(-) diff --git a/resources/less/metager/general/general.less b/resources/less/metager/general/general.less index 015cbc00..1822b1b2 100644 --- a/resources/less/metager/general/general.less +++ b/resources/less/metager/general/general.less @@ -21,6 +21,8 @@ html { min-height: 100%; height: auto; display: flex; + font-size: 14px; + font-size: 3.8mm; } body { @@ -33,6 +35,7 @@ body { display: flex; flex-direction: column; margin: 0; + font-size: 1.0em; @media(max-width: @screen-mobile){ background-color: @body-background-color-mobile } @@ -88,48 +91,47 @@ body { } h1 { - font-size: (@default-font-size * 1.6); + font-size: 2em; .first-last-child-margin-fix; } h2 { - font-size: (@default-font-size * 1.4); + font-size: 1.5em; .first-last-child-margin-fix; } h3 { - font-size: (@default-font-size * 1.2); + font-size: 1.3em; .first-last-child-margin-fix; } p { - font-size: @default-font-size; + font-size: 1em; .first-last-child-margin-fix; } body { - font-size: @default-font-size; .first-last-child-margin-fix; } .page-title { - font-size: (@default-font-size * 3); + font-size: 2.5em; text-align: center; } .page-subtitle { - font-size: @default-font-size; + font-size: 1em; text-align: center; } .subheading { - font-size: 20px; + font-size: 1.2em; margin: 20px 0px; white-space: center; } a { - font-size: 100%; + font-size: 1em; color: @link-color; &:visited { color: @link-color; @@ -169,9 +171,9 @@ i.fa { display: block; width: fit-content; text-decoration: none; - font-size: 75px; + font-size: 2.7em; @media(max-width: @screen-mobile) { - font-size: 50px; + font-size: 2em; } } } @@ -187,7 +189,7 @@ i.fa { left: 10px; h1 { .logo; - font-size: 30px; + font-size: 1.6em; margin: 0; } } @@ -255,7 +257,7 @@ summary { padding: 3px 8px; width: 200px; white-space: pre-wrap; - font-size: 15px; + font-size: .9em; font-weight: normal; text-decoration: none; text-align: center; diff --git a/resources/less/metager/general/specific.less b/resources/less/metager/general/specific.less index a703ee66..1a00e359 100644 --- a/resources/less/metager/general/specific.less +++ b/resources/less/metager/general/specific.less @@ -3,7 +3,7 @@ // kontakt.blade.php, spende.blade.php, zitatsuche.blade.php .form-group { font-family: sans-serif; - font-size: 16px; + font-size: 1em; color: @color-black; background-color: transparent; text-align: center; diff --git a/resources/less/metager/pages/contact.less b/resources/less/metager/pages/contact.less index ea987ab7..b4baf1a9 100644 --- a/resources/less/metager/pages/contact.less +++ b/resources/less/metager/pages/contact.less @@ -1,6 +1,6 @@ .kontakt-form-group { text-align: left; - font-size: 14px; + font-size: 1em; } form.contact { diff --git a/resources/less/metager/pages/donation.less b/resources/less/metager/pages/donation.less index 007524cd..1964d0d1 100644 --- a/resources/less/metager/pages/donation.less +++ b/resources/less/metager/pages/donation.less @@ -1,7 +1,7 @@ #donation { .donation-form-group { text-align: left; - font-size: 12px; + font-size: 1em; } .donation-form-group label { diff --git a/resources/less/metager/pages/help_faq.less b/resources/less/metager/pages/help_faq.less index 977e5637..4e4f0d96 100644 --- a/resources/less/metager/pages/help_faq.less +++ b/resources/less/metager/pages/help_faq.less @@ -42,7 +42,7 @@ border: 2px dashed red; border-radius: 100%; color: black; - font-size: 14px; + font-size: 1em; text-decoration: none; font-weight: normal; } diff --git a/resources/less/metager/pages/resultpage/product.less b/resources/less/metager/pages/resultpage/product.less index 350e954c..ff617257 100644 --- a/resources/less/metager/pages/resultpage/product.less +++ b/resources/less/metager/pages/resultpage/product.less @@ -24,22 +24,14 @@ width: 80px; font-weight: bold; } - .title { - font-size: 12px; - font-weight: bold; - text-align: left; - max-height: 31px; - overflow: hidden; - margin-bottom: 4px; - } .shop { - font-size: 10px; + font-size: .9em; text-align: left; color: @product-shop-color; margin-bottom: 6px; } .shipping { - font-size: 10px; + font-size: .9em; text-align: left; } } \ No newline at end of file diff --git a/resources/less/metager/pages/resultpage/result-page.less b/resources/less/metager/pages/resultpage/result-page.less index b6f8304d..874a1a7a 100644 --- a/resources/less/metager/pages/resultpage/result-page.less +++ b/resources/less/metager/pages/resultpage/result-page.less @@ -30,7 +30,7 @@ h1 { .logo; margin: 0px; - font-size: 22px; + font-size: 1.5em; display: inline-block; } .screen-small { @@ -230,7 +230,7 @@ a { } } > div { - font-size: 12px; + font-size: .9em; color: #777; margin-top: 4px; } @@ -370,10 +370,10 @@ a { padding: 0px 8px; font-weight: 400; a i { - font-size: 80%; + font-size: .9em; } .original { - font-size: 80%; + font-size: .9em; } @media(max-width: @screen-mobile){ .card; @@ -549,7 +549,7 @@ a { margin: 0 8px; justify-content: center; align-items: center; - font-size: 12px; + font-size: .9em; label { margin-bottom: 0; font-weight: normal; @@ -663,5 +663,5 @@ footer.resultPageFooter { .settings-checkbox .settings-icon { margin-left: 5px; - font-size: 12px; + font-size: 1em; } \ No newline at end of file diff --git a/resources/less/metager/pages/resultpage/result.less b/resources/less/metager/pages/resultpage/result.less index 2f5e720c..68da0c79 100644 --- a/resources/less/metager/pages/resultpage/result.less +++ b/resources/less/metager/pages/resultpage/result.less @@ -10,7 +10,7 @@ &:nth-child(1) { margin-top: 0; } - margin: (@padding-small-default * 2) 0px; + margin: @padding-small-default 0px; @media(max-width: @screen-mobile){ .card; margin: @padding-small-default 0px; @@ -29,7 +29,7 @@ .result-title { margin: 0px; &>* { - font-size: @result-font-large; + font-size: .8em; } .overflow-ellipsis; .result-price { @@ -50,7 +50,7 @@ } } .result-hoster { - font-size: @result-font-small; + font-size: .9em; margin-left: 20px; color: #808080; white-space: nowrap; @@ -59,10 +59,11 @@ .result-subheadline { width: 100%; display: flex; + line-height: 1.3; .result-link { .overflow-ellipsis; display: block; - font-size: @result-font-small; + font-size: .95em; width: fit-content; max-width: 100%; &, @@ -70,7 +71,7 @@ &:hover, &:focus, &:visited { - font-size: @result-font-url; + font-size: 1em; text-decoration: none; } &:visited { @@ -82,9 +83,11 @@ padding: 1px; border-radius: 4px; font-weight: bold; - font-size: 10px; - margin-right: 10px; + font-size: .6em; + margin-right: 4px; border: 1px solid; + position: relative; + top: -2px; } } span.partnershop-info { @@ -94,10 +97,11 @@ font-weight: inherit; border: 1px solid #686868; padding: 2px; - margin-left: 20px; + margin-left: 8px; border-radius: 4px; - font-size: 10px; - margin-right: 10px; + font-size: .6em; + position: relative; + top: -2px; } } } @@ -121,7 +125,7 @@ .result-description { margin-bottom: 3px; color: @result-description-color; - font-size: 13px; + font-size: .95em;; line-height: 1.3; clear: both; overflow: hidden; @@ -160,7 +164,7 @@ &:focus, &:visited { color: black; - font-size: @result-font-small; + font-size: .7em; text-decoration: none; } } @@ -176,7 +180,7 @@ &:focus, &:visited { color: black; - font-size: @result-font-small; + font-size: .7em; text-decoration: none; } white-space: nowrap; @@ -187,7 +191,7 @@ } .open-result-options, .close-result-options { font-weight: normal; - font-size: @result-font-small; + font-size: .7em; flex-grow: 1; text-align: right; margin-right: 0; @@ -213,7 +217,7 @@ } .result-footer * { - font-size: 10px !important; + font-size: .7em; } &.ad .ad-label { &, @@ -222,7 +226,7 @@ & a:hover, & a:focus, & a:visited { - font-size: @result-font-small; + font-size: .9em; color: #808080; } } @@ -234,7 +238,7 @@ &>.result-options { max-width: 100%; &>.options { - font-size: @result-font-small; + font-size: .85em; border-top: 1px solid #ccc; width: 100%; text-align: right; @@ -249,7 +253,7 @@ flex-wrap: wrap; margin-bottom: 0; li { - font-size: @result-font-small; + font-size: .85em; margin: 8px 16px 8px 0; } @media(max-width: @screen-mobile){ diff --git a/resources/less/metager/pages/start-page.less b/resources/less/metager/pages/start-page.less index a2754109..78bda490 100644 --- a/resources/less/metager/pages/start-page.less +++ b/resources/less/metager/pages/start-page.less @@ -75,10 +75,10 @@ } } h2 { - font-size: 21px; + font-size: 1.3em; } p { - font-size: 15px; + font-size: 1em; } } #s { @@ -87,7 +87,7 @@ .card-medium; } h2 { - font-size: 21px; + font-size: 1.3em; } ul { list-style-type: none; @@ -99,7 +99,7 @@ color: inherit; display: flex; justify-content: space-between; - font-size: 15px; + font-size: 1em; i { margin-left: 10px; } diff --git a/resources/less/metager/pages/widget.less b/resources/less/metager/pages/widget.less index 964d52fd..516acf13 100644 --- a/resources/less/metager/pages/widget.less +++ b/resources/less/metager/pages/widget.less @@ -2,7 +2,7 @@ height: 30px; float: left; padding: 6px 12px; - font-size: 14px; + font-size: 1em; line-height: 1.42857; color: #555; background-color: white; @@ -21,7 +21,7 @@ border: 1px solid #CCC; padding: 6px 12px; margin: 0px; - font-size: 14px; + font-size: 1em; font-weight: normal; line-height: 1; white-space: nowrap; diff --git a/resources/less/metager/parts/searchbar.less b/resources/less/metager/parts/searchbar.less index 21d96d98..eb17f410 100644 --- a/resources/less/metager/parts/searchbar.less +++ b/resources/less/metager/parts/searchbar.less @@ -10,7 +10,7 @@ -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; - font-size: 16px; + font-size: 1em; background-color: transparent; color: #333; .search-input-submit { @@ -56,11 +56,11 @@ #search-delete-btn { position: absolute; right: 2px; - bottom: 1px; + bottom: 5px; width: auto; border: none; background-color: white; - font-size: 25px; + font-size: 1.8em; font-weight: normal; display: none; &:hover { diff --git a/resources/less/metager/parts/sidebar.less b/resources/less/metager/parts/sidebar.less index ff26f96e..95358b02 100644 --- a/resources/less/metager/parts/sidebar.less +++ b/resources/less/metager/parts/sidebar.less @@ -39,7 +39,7 @@ } } &>label { - font-size: 16px; + font-size: 1.1em; font-weight: normal; text-decoration: none; text-indent: 12px; @@ -63,7 +63,7 @@ transition: 0.5s ease; &>li>a { display: block; - font-size: 13px; + font-size: .9em; padding: 6px 20px; width: 100%; clear: both; @@ -82,7 +82,7 @@ } } a { - font-size: 16px; + font-size: 1.1em; line-height: 20px; text-decoration: none; text-indent: 12px; diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php index 033649ca..dc010c73 100644 --- a/resources/views/layouts/ad.blade.php +++ b/resources/views/layouts/ad.blade.php @@ -13,7 +13,7 @@
- {{ $ad->anzeigeLink }} + {{ $ad->anzeigeLink }}
-- GitLab