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

Fanshop zur Startseite und zur Navigationsleiste hinzugefügt.

parent d5f22cc9
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Expand all Hide whitespace changes
Inline Side-by-side
composer.lock
+ 484
− 357
View file @ 6893b752
This diff is collapsed.
resources/assets/less/metager/static-pages.less
+ 49
− 27
View file @ 6893b752
......@@ -102,7 +102,8 @@ ul.metager-dropdown-menu {
text-align: left;
background-color: @metager-dropdown-menu-background-color;
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;
max-height: 0px;
overflow: hidden;
......@@ -146,6 +147,23 @@ ul.metager-dropdown-menu {
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 {
0% {
max-height: 0px;
......@@ -166,11 +184,16 @@ ul.metager-dropdown-menu {
.metager-dropdown:hover {
background-color: @metager-navbar-toggle-hover-background-color;
&>.metager-dropdown-menu {
animation-name: dropdown-animation;
animation-duration: 0.7s;
animation-timing-function: ease-out;
animation-fill-mode: forwards;
animation-delay: 0.1s;
-webkit-animation-name: dropdown-animation;
animation-name: dropdown-animation;
-webkit-animation-duration: 0.7s;
animation-duration: 0.7s;
-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 {
position: inherit;
width: 100%;
border-radius: 0;
box-shadow: initial;
-webkit-box-shadow: initial;
box-shadow: initial;
}
ul#metager-static-nav-list:target #toggle-nav-show {
display: none;
......@@ -300,7 +324,8 @@ ul.metager-dropdown-menu {
}
#moreInformation {
box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
margin-top: 5%;
text-align: center;
-moz-box-shadow: none;
......@@ -384,8 +409,6 @@ div#expand {
max-height: 0px;
overflow: hidden;
-webkit-transition: max-height 0.5s;
-moz-transition: max-height 0.5s;
-o-transition: max-height 0.5s;
transition: max-height 0.5s;
}
......@@ -452,11 +475,11 @@ textarea#message {
margin-bottom: 0;
background-color: @mg-panel-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);
@media (max-width: 768px) {
margin: 0px;
box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
}
......@@ -556,7 +579,6 @@ textarea#message {
.modal-content {
border-radius: 0;
-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;
}
......@@ -653,7 +675,8 @@ label.select-label {
section {
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;
}
......@@ -677,19 +700,18 @@ label a {
}
footer {
margin: 30px 0px;
bottom: 0;
width: 100%;
ul.list-inline {
width: 100%;
}
li {
width: 33%;
text-align: center;
}
img {
max-width: 100%;
}
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-ms-flex-pack: distribute;
justify-content: space-around;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
footer .links > a, footer .links > span {
margin: 0 5px;
}
main ul li:not(.lslide) {
......
resources/views/layouts/staticPages.blade.php
+ 29
− 11
View file @ 6893b752
......@@ -45,8 +45,8 @@
</li>
<li id="toggle-nav-show">
<a class="metager-navbar-toggle pull-right" href="#metager-static-nav-list" data-original-title="" title="">
<span class="sr-only">Navigation anzeigen</span>
<i class="fa fa-bars" aria-hidden="true"></i>
<span class="sr-only">Navigation anzeigen</span>
<i class="fa fa-bars" aria-hidden="true"></i>
</a>
<div class="clearfix"></div>
</li>
......@@ -66,6 +66,12 @@
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
</li>
@if(LaravelLocalization::getCurrentLocale() == "de")
<li>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">MetaGer-Fanshop</a>
</li>
@endif
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
......@@ -167,20 +173,32 @@
</main>
@yield('optionalContent')
<footer class="noprint">
<ul class="list-inline hidden-xs">
<li>
<div class="hidden-xs mg-img">
<a href="https://www.suma-ev.de/" >
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
</li>
<li id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</li>
<li>
</div>
<div id="info">
<div class="links">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">
{{ trans('staticPages.nav5') }}
</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/" >
<img src="/img/luh_metager.png" alt="LUH Logo"></a>
</li>
</ul>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</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