Commit ec978f3c authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '606' into 'MetaGer-Redesign'

Fixed  - Footer wird jetzt auf jeder Seite am Seitenende angezeigt

See merge request !1076
parents b313bb0e c87a9703
...@@ -38,7 +38,7 @@ body { ...@@ -38,7 +38,7 @@ body {
background-color: white; background-color: white;
} }
footer { .footer-resultpage {
text-align: center; text-align: center;
a { a {
color: @footer-a-color; color: @footer-a-color;
......
...@@ -38,7 +38,12 @@ ...@@ -38,7 +38,12 @@
font-family: Liberation Sans, sans-serif; font-family: Liberation Sans, sans-serif;
} }
html {
height: 100%;
}
body { body {
height: 100%;
margin: 0; margin: 0;
&>div { &>div {
padding-top: 70px; padding-top: 70px;
...@@ -64,6 +69,13 @@ footer { ...@@ -64,6 +69,13 @@ footer {
} }
} }
.wrapper {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
}
ul.startpage { ul.startpage {
list-style-type: none; list-style-type: none;
} }
...@@ -122,7 +134,7 @@ ul.metager-dropdown-menu { ...@@ -122,7 +134,7 @@ ul.metager-dropdown-menu {
} }
#mglogo { #mglogo {
color: rgb(255,128,0); color: rgb(255, 128, 0);
text-shadow: 2px 2px 10px rgba(150, 150, 150, 1); text-shadow: 2px 2px 10px rgba(150, 150, 150, 1);
text-align: center; text-align: center;
} }
...@@ -163,7 +175,7 @@ ul.metager-dropdown-menu { ...@@ -163,7 +175,7 @@ ul.metager-dropdown-menu {
} }
} }
#metager-static-nav-list > li:hover { #metager-static-nav-list>li:hover {
background-color: @metager-navbar-toggle-hover-background-color; background-color: @metager-navbar-toggle-hover-background-color;
&>.metager-dropdown-menu { &>.metager-dropdown-menu {
animation-name: dropdown-animation; animation-name: dropdown-animation;
...@@ -224,7 +236,6 @@ ul.metager-dropdown-menu { ...@@ -224,7 +236,6 @@ ul.metager-dropdown-menu {
} }
} }
#color-chooser { #color-chooser {
padding: 0; padding: 0;
a { a {
...@@ -343,7 +354,6 @@ div#top { ...@@ -343,7 +354,6 @@ div#top {
padding-right: 35px; padding-right: 35px;
} }
div#bottom { div#bottom {
background-color: @div-right-background-color; background-color: @div-right-background-color;
width: 100%; width: 100%;
...@@ -363,7 +373,7 @@ div#bottom label { ...@@ -363,7 +373,7 @@ div#bottom label {
display: block; display: block;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
color: #666; color: #666;
} }
...@@ -372,32 +382,33 @@ div#bottom label:hover { ...@@ -372,32 +382,33 @@ div#bottom label:hover {
} }
div#bottom label::after { div#bottom label::after {
font-size: 18px; font-size: 18px;
content: "▼"; content: "▼";
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-left: 3px; margin-left: 3px;
} }
div#expand { div#expand {
max-height: 0px; max-height: 0px;
overflow: hidden; overflow: hidden;
-webkit-transition: max-height 0.5s; -webkit-transition: max-height 0.5s;
-moz-transition: max-height 0.5s; -moz-transition: max-height 0.5s;
-o-transition: max-height 0.5s; -o-transition: max-height 0.5s;
transition: max-height 0.5s; transition: max-height 0.5s;
} }
input#toggle:checked ~ #expand { input#toggle:checked~#expand {
max-height: 900px; max-height: 900px;
} }
input#toggle { input#toggle {
display: none; display: none;
visibility: hidden; visibility: hidden;
} }
input#toggle:checked ~ label::after {
content: "▲"; input#toggle:checked~label::after {
content: "▲";
} }
textarea#message { textarea#message {
...@@ -444,14 +455,14 @@ textarea#message { ...@@ -444,14 +455,14 @@ textarea#message {
} }
select[name=focus] { select[name=focus] {
font-family: FontAwesome, sans-serif; font-family: FontAwesome, sans-serif;
padding: 0.5em; padding: 0.5em;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
} }
select[name=focus] > option { select[name=focus]>option {
font-family: FontAwesome, sans-serif; font-family: FontAwesome, sans-serif;
} }
.input-group-addon { .input-group-addon {
...@@ -634,13 +645,11 @@ label.select-label { ...@@ -634,13 +645,11 @@ label.select-label {
.noprint { .noprint {
display: none!important; display: none!important;
} }
.beitritt-formular-info * { .beitritt-formular-info * {
font-size: 7pt !important; font-size: 7pt !important;
} }
} }
.donation-form-group label { .donation-form-group label {
font-weight: bold; font-weight: bold;
} }
...@@ -671,31 +680,14 @@ label a { ...@@ -671,31 +680,14 @@ label a {
} }
#submit-inputgroup { #submit-inputgroup {
background-color: inherit; background-color: inherit;
border-left: 0; border-left: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
} }
input[name=eingabe] { input[name=eingabe] {
border-right: 0; border-right: 0;
box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075);
}
footer {
position: absolute;
margin: 30px 0px;
bottom: 0;
width: 100%;
ul.list-inline {
width: 100%;
}
li {
width: 33%;
text-align: center;
}
img {
max-width: 100%;
}
} }
main ul li:not(.lslide) { main ul li:not(.lslide) {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
{!! trans('kontakt.form.1') !!}</a> {!! trans('kontakt.form.1') !!}</a>
</strong> </strong>
</div> </div>
<footer> <footer class="footer-resultpage">
<div class="row"> <div class="row">
<div @if(LaravelLocalization::getCurrentLocale() === "de") class="col-xs-4"@else class="col-xs-6"@endif> <div @if(LaravelLocalization::getCurrentLocale() === "de") class="col-xs-4"@else class="col-xs-6"@endif>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a> <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
@yield('content') @yield('content')
</main> </main>
@yield('optionalContent') @yield('optionalContent')
<footer class="noprint"> <footer class="footer-static-pages noprint">
<ul class="list-inline hidden-xs"> <ul class="list-inline hidden-xs">
<li> <li>
<a href="https://www.suma-ev.de/" > <a href="https://www.suma-ev.de/" >
......
Markdown is supported
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