Commit b1f2916c authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch 'development' into 517-build-prozess-auf-server-auslagern

parents 81ce2d66 698e8273
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
@body-background-color: @base-body-backround-color;
@aufruf-winter-a-normal-or-visited: @base-aufruf-winter-color!important;
@aufruf-winter-aufruf-action-btn-color: @base-aufruf-winter-btn-color!important;
@aufruf-winter-aufruf-action-btn-background-color: @base-aufruf-winter-color!important;
@aufruf-winter-aufruf-action-btn-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-aufruf-action-btn-hover-background-color: @base-aufruf-winter-btn-hover-background-color !important;
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@new-feature-badge-background-color: @base-new-feature-badge-background-color;
body {
background-color: @body-background-color;
background-attachment: fixed;
}
body#resultBody {
background-image: inherit;
}
summary {
cursor: pointer;
&::-webkit-details-marker {
......@@ -20,52 +38,47 @@ summary {
.aufruf-winter {
h1 {
font-size: 32px;
@media(max-width: @screen-md-max) {
.aufruf-winter h1 {
font-size: 27px;
}
}
}
a,
a:visited {
color: #AB2121;
color: @aufruf-winter-a-normal-or-visited;
}
.aufruf-action-btn {
color: white!important;
background-color: #AB2121 !important;
border-color: #953535;
color: @aufruf-winter-aufruf-action-btn-color;
background-color: @aufruf-winter-aufruf-action-btn-background-color;
border-color: @aufruf-winter-aufruf-action-btn-border-color;
}
.aufruf-action-btn:hover {
background-color: #BD0D0D !important;
border-color: #953535;
background-color: @aufruf-winter-aufruf-action-btn-hover-background-color;
border-color: @aufruf-winter-aufruf-action-btn-hover-border-color;
}
&.mg-panel {
background-image: url("/img/snowflake.svg");
background-repeat: no-repeat;
background-position: right top;
background-size: 100px 100px;
@media(max-width: @screen-sm-max) {
background-size: 60px 60px;
}
@media(min-width: @screen-lg) {
width: 940px;
}
}
&.quicktip {
border-left: 3px solid #AB2121 !important;
border-left: 3px solid @aufruf-winter-quicktip-border-color;
}
}
.new-feature.badge {
background-color: rgb(255, 128, 0);
}
@media(max-width: @screen-sm-max) {
.aufruf-winter.mg-panel {
background-size: 60px 60px;
@media(max-width: @screen-md-max) {
.lead {
font-size: 18px;
}
}
}
@media(max-width: @screen-md-max) {
.aufruf-winter h1 {
font-size: 27px;
}
.aufruf-winter .lead {
font-size: 18px;
}
}
@media(min-width: @screen-lg) {
.aufruf-winter.mg-panel {
width: 940px;
}
.new-feature.badge {
background-color: @new-feature-badge-background-color;
}
\ No newline at end of file
@media print {
.container {
width: auto !important;
margin: 0px;
padding: 0px;
}
hr {
display: none !important;
}
#spendenaufruf {
display: none !important;
}
header {
display: none !important;
}
footer {
display: none !important;
}
.wrapper {
h1 {
margin-top: 0 !important;
padding-top: 0 !important;
}
* {
font-size: 12px!important;
hr {
display: none !important;
}
input[type=text], input[type=email] {
margin: 0px !important;
......@@ -28,21 +18,6 @@
height: initial !important;
border: 0;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
.donation-amount-input {
padding-top: 5px;
}
h1 {
margin-top: 0 !important;
padding-top: 0 !important;
}
/* Skalierung für Firefox, absolut für die anderen Browser */
input[type=radio] {
transform: scale(0.5);
......@@ -71,7 +46,32 @@
/* Internet Explorer 10+ */
color: transparent !important;
}
.container {
width: auto !important;
margin: 0px;
padding: 0px;
}
.wrapper {
padding-top: 0 !important;
}
* {
font-size: 12px!important;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
.donation-amount-input {
padding-top: 5px;
}
.pagebreak {
page-break-before: always;
}
#spendenaufruf {
display: none !important;
}
}
\ No newline at end of file
......@@ -3,4 +3,5 @@
@import "./result-page.less";
@import "./quicktips.less";
@import "./start-page.less";
@import "./settings.less";
\ No newline at end of file
@import "./settings.less";
@import "./variables.less";
\ No newline at end of file
.qtheader {
font-size: 16px;
margin: 0px;
font-weight: bold;
font-size: 16px;
margin: 0px;
font-weight: bold;
}
.detail-short {
font-weight: bold;
font-size: 18px;
line-height: 30px;
.qt-icon {
height: 60px;
}
.qt-icon {
height: 60px;
.detail-short {
font-weight: bold;
font-size: 18px;
line-height: 30px;
}
\ No newline at end of file
@body-background-color: @result-page-body-background-color;
@footer-a-color: @result-page-color-black!important;
@hostlabel-a-link-or-visited-color: @result-page-color-white;
@hostlabel-background-color: @result-page-color-strong-grey;
@navbar-resultpage-background-color: @result-page-color-white;
@navbar-resultpage-ul-li-a-not-metager-navbar-toggle-color: @result-page-color-grey;
@navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color: @result-page-color-almost-white;
@research-a-color: @result-page-color-black;
@content-wrapper-background-color: @result-page-color-white;
@a-visited-color: @result-page-a-visited-color;
@a-hover-color: @result-page-a-hover-color;
@a-donation-normal-or-visited-color: inherit;
@a-donation-hover-color: @result-page-a-hover-color;
@resultpage-foki-or-foki-background-color: @result-page-color-white;
@resultpage-foki-or-foki-li-a-color: @result-page-color-grey;
@resultpage-foki-or-foki-li-active-a-color: @result-page-color-black;
@resultpage-foki-or-foki-li-active-a-background-color: @result-page-color-white;
@spruch-author-color: @result-page-color-strong-grey;
@result-title-color: @result-page-color-black;
@result-link-options-color: @result-page-color-strong-grey;
@result-link-options-a-color: @result-page-color-strong-grey;
@result-description-color: @result-page-color-black;
@result-description-img-border-color: @result-page-color-almost-white;
@result-hoster-color: @result-page-color-grey;
@result-hoster-a-color: @result-page-color-strong-grey;
@options-list-li-hover-background-color: @result-page-color-almost-white;
@options-list-li-a-color: @result-page-color-strong-grey;
@image-item-img-box-shadow-color: fade(@result-page-color-black, 30%);
@searchplugin-a-color: @result-page-color-white;
@product-border-color: @result-page-color-almost-white;
@product-a-color: @result-page-color-strong-grey;
@product-price-color: @result-page-color-strong-grey;
@product-price-background-color: fade(@result-page-color-white, 90%);
@product-shop-color: @result-page-product-shop-color;
@lsprev-or-lsnext-i-background-color: @result-page-color-black;
body {
background-image: inherit;
background-color: @body-background-color;
}
footer {
text-align: center;
a {
color: @footer-a-color;
}
}
#map,
#map div {
display: flex;
......@@ -14,16 +61,15 @@
padding-top: 10px;
}
.hostlabel a:link,
.hostlabel a:visited {
color: #FFFFFF;
}
.hostlabel {
display: none;
position: relative;
margin-top: -14px;
background-color: #333;
background-color: @hostlabel-background-color;
a:link,
a:visited {
color: @hostlabel-a-link-or-visited-color;
}
}
.img:hover .hostlabel {
......@@ -35,22 +81,6 @@
padding-top: 0;
}
/* Hier der Style für unsere Suchleiste */
.navbar-resultpage {
right: initial;
left: initial;
margin-bottom: 0px;
}
@media (max-width: @screen-xs-max) {
.navbar-resultpage {
right: 0px!important;
left: 0px!important;
}
}
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
......@@ -61,45 +91,56 @@
padding-left: 49px;
}
.navbar-resultpage .container {
padding: 0px;
margin: 0px;
}
.navbar-resultpage .logo {
padding-top: 0px;
}
.navbar-resultpage .input-group {
margin: 0px 5px;
.navbar-resultpage {
background-color: @navbar-resultpage-background-color;
position: absolute;
&>ul>li {
padding-left: 0;
padding-right: 0;
&>a:not(.metager-navbar-toggle) {
display: block;
padding: 10px;
color: @navbar-resultpage-ul-li-a-not-metager-navbar-toggle-color;
}
&.active>a,
a.metager-dropdown-toggle:hover,
a.metager-dropdown-toggle:focus {
background-color: @navbar-resultpage-ul-li-a-metager-dropdown-toggle-hover-or-focus-background-color;
}
}
&>ul.list-inline {
margin-bottom: 0;
}
@media (max-width: @screen-xs-max) {
right: 0px!important;
left: 0px!important;
}
right: initial;
left: initial;
margin-bottom: 0px;
.container {
padding: 0px;
margin: 0px;
}
.logo {
padding-top: 0px;
}
.input-group {
margin: 0px 5px;
}
}
.dense-col {
padding: 0px
}
/* Logo */
.logo {
height: 35px;
padding: 5px 0;
}
.logo>a {
line-height: 100%;
height: 100%;
display: block;
}
#research ul.list-inline {
margin-left: 0;
width: 100%;
}
@media (max-width: 767px) {
#research .visible-xs {
display: inline-block!important;
&>a {
line-height: 100%;
height: 100%;
display: block;
}
}
......@@ -116,27 +157,32 @@ nav .input-group {
padding: 5px 0;
}
/*header ul {
height: 100%;
vertical-align: middle;
}*/
#research nav ul>li {
width: 20%; //height: 45px;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul>li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
}
.navbar-resultpage {
background-color: white;
#research {
nav {
ul>li {
width: 20%;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
ul>li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
}
}
ul.list-inline {
margin-left: 0;
width: 100%;
}
a {
color: @research-a-color;
}
.visible-xs {
@media (max-width: 767px) {
display: inline-block!important;
}
}
}
.logo h1 {
......@@ -155,14 +201,10 @@ nav .input-group {
height: 100%;
}
#reSearch a {
color: black;
}
.content-wrapper {
padding: 0px;
padding-top: 52px;
background-color: white;
background-color: @content-wrapper-background-color;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
......@@ -172,42 +214,35 @@ nav .input-group {
color: black;
}
body {
background-image: inherit;
background-color: rgba(2, 93, 140, .03);
}
a#donation,
a#donation:visited {
color: inherit;
}
a#donation:hover {
color: red;
}
a:visited {
color: #792ea1;
}
a:hover {
text-decoration: none;
color: red;
a {
&:visited {
color: @a-visited-color;
}
&:hover {
text-decoration: none;
color: @a-hover-color;
}
&#donation {
&,
&:visited {
color: @a-donation-normal-or-visited-color;
}
&:hover {
color: @a-donation-hover-color;
}
}
}
/* Hier der Style für unsere Tabliste */
.resultpage-foki,
.foki {
background-color: white;
background-color: @resultpage-foki-or-foki-background-color;
li {
margin: 0px;
margin-bottom: -1px;
a {
color: grey;
color: @resultpage-foki-or-foki-li-a-color;
padding: 8px 12px;
i + span {
i+span {
margin-left: 5px;
}
}
......@@ -215,12 +250,12 @@ a:hover {
margin-left: 3px;
}
&.active {
i + span {
i+span {
display: inline!important;
}
a {
color: black;
background-color: white;
color: @resultpage-foki-or-foki-li-active-a-color;
background-color: @resultpage-foki-or-foki-li-active-a-background-color;
}
}
}
......@@ -237,7 +272,7 @@ a:hover {
font-size: 80%;
font-weight: normal;
font-style: italic;
color: #333333;
color: @spruch-author-color;
}
&>p {
margin-bottom: 0;
......@@ -247,12 +282,9 @@ a:hover {
}
}
/* Hier der Style für die einzelnen Ergebnisboxen */
.saver-options {
display: flex;
padding-bottom: 15px;
&>input{
min-width: 35%;
max-width: 80%;
......@@ -286,7 +318,7 @@ a:hover {
}
.title {
color: black;
color: @result-title-color;
text-decoration: none;
font-size: 14px;
font-weight: bold;
......@@ -309,11 +341,11 @@ a:hover {
margin: 0 5px;
}
.options {
color: #333;
color: @result-link-options-color;
float: left;
}
.options>a {
color: #333;
color: @result-link-options-a-color;
display: block;
padding-left: 8px;
padding-right: 5px;
......@@ -332,7 +364,7 @@ a:hover {
}
.description {
margin-bottom: 3px;
color: black;
color: @result-description-color;
font-size: 14px;
line-height: 1.3;
clear: both;
......@@ -347,7 +379,8 @@ a:hover {
height: auto;
width: auto;
max-width: 120px;
max-height: 200px
max-height: 200px;
border: solid 1px @result-description-img-border-color;
}
}
&.ad .description {
......@@ -359,11 +392,11 @@ a:hover {
.hoster {
font-size: 13px;
margin: 0;
color: #777;
color: @result-hoster-color;
margin-right: 10px;
white-space: nowrap;
a {
color: #333;
color: @result-hoster-a-color;
}
}
.proxy {
......@@ -395,10 +428,10 @@ a:hover {
.options-list>li {
&:hover {
background-color: lightgrey;
background-color: @options-list-li-hover-background-color;
}
&>a {
color: #333;