Skip to content
Snippets Groups Projects
Commit b373c185 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

changed font-size to a relative one

parent 6c36d4d2
No related branches found
No related tags found
1 merge request!1410Development
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 64 deletions
resources/less/metager/general/general.less
+ 15
− 13
View file @ b373c185
......@@ -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;
......
resources/less/metager/general/specific.less
+ 1
− 1
View file @ b373c185
......@@ -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;
......
resources/less/metager/pages/contact.less
+ 1
− 1
View file @ b373c185
.kontakt-form-group {
text-align: left;
font-size: 14px;
font-size: 1em;
}
form.contact {
......
resources/less/metager/pages/donation.less
+ 1
− 1
View file @ b373c185
#donation {
.donation-form-group {
text-align: left;
font-size: 12px;
font-size: 1em;
}
.donation-form-group label {
......
resources/less/metager/pages/help_faq.less
+ 1
− 1
View file @ b373c185
......@@ -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;
}
......
resources/less/metager/pages/resultpage/product.less
+ 2
− 10
View file @ b373c185
......@@ -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
resources/less/metager/pages/resultpage/result-page.less
+ 6
− 6
View file @ b373c185
......@@ -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
resources/less/metager/pages/resultpage/result.less
+ 22
− 18
View file @ b373c185
......@@ -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){
......
resources/less/metager/pages/start-page.less
+ 4
− 4
View file @ b373c185
......@@ -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;
}
......
resources/less/metager/pages/widget.less
+ 2
− 2
View file @ b373c185
......@@ -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;
......
resources/less/metager/parts/searchbar.less
+ 3
− 3
View file @ b373c185
......@@ -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 {
......
resources/less/metager/parts/sidebar.less
+ 3
− 3
View file @ b373c185
......@@ -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;
......
resources/views/layouts/ad.blade.php
+ 1
− 1
View file @ b373c185
......@@ -13,7 +13,7 @@
<div class="result-subheadline">
<a class="result-link" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}">
<span class="advertisement-mark">Anzeige</span>
{{ $ad->anzeigeLink }}
<span>{{ $ad->anzeigeLink }}</span>
</a>
</div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment