Commit d3153a14 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '684-metager-fanshop-verlinken' into 'development'

Resolve "MetaGer Fanshop Verlinken"

Closes #684

See merge request !1174
parents 991c6abe baaa8634
This diff is collapsed.
...@@ -102,7 +102,8 @@ ul.metager-dropdown-menu { ...@@ -102,7 +102,8 @@ ul.metager-dropdown-menu {
text-align: left; text-align: left;
background-color: @metager-dropdown-menu-background-color; background-color: @metager-dropdown-menu-background-color;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 6px 12px @metager-dropdown-menu-box-shadow-color; -webkit-box-shadow: 0 6px 12px @metager-dropdown-menu-box-shadow-color;
box-shadow: 0 6px 12px @metager-dropdown-menu-box-shadow-color;
background-clip: padding-box; background-clip: padding-box;
max-height: 0px; max-height: 0px;
overflow: hidden; overflow: hidden;
...@@ -146,6 +147,23 @@ ul.metager-dropdown-menu { ...@@ -146,6 +147,23 @@ ul.metager-dropdown-menu {
width: 100%; width: 100%;
} }
@-webkit-keyframes dropdown-animation {
0% {
max-height: 0px;
padding: 0px 0;
border: none
}
1% {
padding: 5px 0;
border: 1px solid @metager-dropdown-toggle-hover-or-focus-color;
}
100% {
max-height: 1000px;
padding: 5px 0;
border: 1px solid @metager-dropdown-toggle-hover-or-focus-color;
}
}
@keyframes dropdown-animation { @keyframes dropdown-animation {
0% { 0% {
max-height: 0px; max-height: 0px;
...@@ -166,11 +184,16 @@ ul.metager-dropdown-menu { ...@@ -166,11 +184,16 @@ ul.metager-dropdown-menu {
.metager-dropdown:hover { .metager-dropdown: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; -webkit-animation-name: dropdown-animation;
animation-duration: 0.7s; animation-name: dropdown-animation;
animation-timing-function: ease-out; -webkit-animation-duration: 0.7s;
animation-fill-mode: forwards; animation-duration: 0.7s;
animation-delay: 0.1s; -webkit-animation-timing-function: ease-out;
animation-timing-function: ease-out;
-webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
-webkit-animation-delay: 0.1s;
animation-delay: 0.1s;
} }
} }
...@@ -209,7 +232,8 @@ ul.metager-dropdown-menu { ...@@ -209,7 +232,8 @@ ul.metager-dropdown-menu {
position: inherit; position: inherit;
width: 100%; width: 100%;
border-radius: 0; border-radius: 0;
box-shadow: initial; -webkit-box-shadow: initial;
box-shadow: initial;
} }
ul#metager-static-nav-list:target #toggle-nav-show { ul#metager-static-nav-list:target #toggle-nav-show {
display: none; display: none;
...@@ -300,7 +324,8 @@ ul.metager-dropdown-menu { ...@@ -300,7 +324,8 @@ ul.metager-dropdown-menu {
} }
#moreInformation { #moreInformation {
box-shadow: none; -webkit-box-shadow: none;
box-shadow: none;
margin-top: 5%; margin-top: 5%;
text-align: center; text-align: center;
-moz-box-shadow: none; -moz-box-shadow: none;
...@@ -384,8 +409,6 @@ div#expand { ...@@ -384,8 +409,6 @@ 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;
-o-transition: max-height 0.5s;
transition: max-height 0.5s; transition: max-height 0.5s;
} }
...@@ -452,11 +475,11 @@ textarea#message { ...@@ -452,11 +475,11 @@ textarea#message {
margin-bottom: 0; margin-bottom: 0;
background-color: @mg-panel-background-color; background-color: @mg-panel-background-color;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); -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); box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
@media (max-width: 768px) { @media (max-width: 768px) {
margin: 0px; margin: 0px;
box-shadow: none; -webkit-box-shadow: none;
box-shadow: none;
} }
} }
...@@ -556,7 +579,6 @@ textarea#message { ...@@ -556,7 +579,6 @@ textarea#message {
.modal-content { .modal-content {
border-radius: 0; border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; -webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
-moz-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
} }
...@@ -653,7 +675,8 @@ label.select-label { ...@@ -653,7 +675,8 @@ label.select-label {
section { section {
padding: 10px; padding: 10px;
box-shadow: 5px 5px 10px 0px @section-box-shadow-color; -webkit-box-shadow: 5px 5px 10px 0px @section-box-shadow-color;
box-shadow: 5px 5px 10px 0px @section-box-shadow-color;
-moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color;
-moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color; -moz-box-shadow: 5px 5px 10px 0px @section-box-shadow-color;
} }
...@@ -677,19 +700,18 @@ label a { ...@@ -677,19 +700,18 @@ label a {
} }
footer { footer {
margin: 30px 0px; display: -webkit-box;
bottom: 0; display: -ms-flexbox;
width: 100%; display: flex;
ul.list-inline { -ms-flex-pack: distribute;
width: 100%; justify-content: space-around;
} -webkit-box-align: center;
li { -ms-flex-align: center;
width: 33%; align-items: center;
text-align: center; }
}
img { footer .links > a, footer .links > span {
max-width: 100%; margin: 0 5px;
}
} }
main ul li:not(.lslide) { main ul li:not(.lslide) {
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
</li> </li>
<li id="toggle-nav-show"> <li id="toggle-nav-show">
<a class="metager-navbar-toggle pull-right" href="#metager-static-nav-list" data-original-title="" title=""> <a class="metager-navbar-toggle pull-right" href="#metager-static-nav-list" data-original-title="" title="">
<span class="sr-only">Navigation anzeigen</span> <span class="sr-only">Navigation anzeigen</span>
<i class="fa fa-bars" aria-hidden="true"></i> <i class="fa fa-bars" aria-hidden="true"></i>
</a> </a>
<div class="clearfix"></div> <div class="clearfix"></div>
</li> </li>
...@@ -66,6 +66,12 @@ ...@@ -66,6 +66,12 @@
<li> <li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a> <a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
</li> </li>
@if(LaravelLocalization::getCurrentLocale() == "de")
<li>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">MetaGer-Fanshop</a>
</li>
@endif
</ul> </ul>
</li> </li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif > <li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
...@@ -167,20 +173,32 @@ ...@@ -167,20 +173,32 @@
</main> </main>
@yield('optionalContent') @yield('optionalContent')
<footer class="noprint"> <footer class="noprint">
<ul class="list-inline hidden-xs"> <div class="hidden-xs mg-img">
<li>
<a href="https://www.suma-ev.de/" > <a href="https://www.suma-ev.de/" >
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a> <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
</li> </div>
<li id="info"> <div id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a> <div class="links">
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">
</li> {{ trans('staticPages.nav5') }}
<li> </a>
<span> - </span>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">
{{ trans('staticPages.nav8') }}
</a>
@if(LaravelLocalization::getCurrentLocale() == "de")
<span> - </span>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">Fanshop</a>
@endif
</div>
<div>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</div>
</div>
<div class="hidden-xs mg-img">
<a href="https://www.uni-hannover.de/" > <a href="https://www.uni-hannover.de/" >
<img src="/img/luh_metager.png" alt="LUH Logo"></a> <img src="/img/luh_metager.png" alt="LUH Logo"></a>
</li> </li>
</ul>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div> </div>
......
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