Commit 6f050b60 authored by Aria Givi's avatar Aria Givi

Merge branch 'MetaGer-Redesign' of...

Merge branch 'MetaGer-Redesign' of https://gitlab.metager3.de/open-source/MetaGer into MetaGer-Redesign
parents 1c65b178 e4104450
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
footer { footer {
padding: 5px 5px 15px 5px; padding: 5px 5px 15px 5px;
width: 100%; width: 100%;
background-color: white; background-color: inherit;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
white-space: pre-line; white-space: pre-line;
......
...@@ -272,6 +272,8 @@ p.mg-logo { ...@@ -272,6 +272,8 @@ p.mg-logo {
border-radius: 10px; border-radius: 10px;
padding: 5px; padding: 5px;
margin-left: 10px; margin-left: 10px;
background-color: white;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
&:first-child { &:first-child {
margin-left: 0px; margin-left: 0px;
} }
...@@ -396,4 +398,13 @@ p.mg-logo { ...@@ -396,4 +398,13 @@ p.mg-logo {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
} }
}
footer.resultPageFooter {
max-width: 700px;
margin-left: 50px;
margin-top: 20px;
@media (max-width: (2 * @results-margin-left + @result-width - 1px)) {
margin: 20px 0 0 0;
}
} }
\ No newline at end of file
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
width: 100%; width: 100%;
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: white; background-color: white;
@media(max-width: @screen-xs-max) { box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
}
.result-header { .result-header {
.result-title { .result-title {
margin: 0px; margin: 0px;
......
...@@ -281,7 +281,7 @@ header { ...@@ -281,7 +281,7 @@ header {
z-index: 100; z-index: 100;
max-width: 700px; max-width: 700px;
width:100%; width:100%;
background-color: #FAFAFA; background-color: inherit;
@media (max-width: 1070px) { @media (max-width: 1070px) {
margin-left: 0px; margin-left: 0px;
-webkit-box-pack: center; -webkit-box-pack: center;
...@@ -302,9 +302,9 @@ header { ...@@ -302,9 +302,9 @@ header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
@media (max-width: 799px) { @media (max-width: 799px) {
margin: 0px 8px; margin: 0px 8px;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
} }
} }
...@@ -321,6 +321,7 @@ header { ...@@ -321,6 +321,7 @@ header {
padding: 10px; padding: 10px;
margin-left: 50px; margin-left: 50px;
overflow-x: auto; overflow-x: auto;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
&::-webkit-scrollbar { &::-webkit-scrollbar {
height: 0px; /* remove scrollbar space */ height: 0px; /* remove scrollbar space */
...@@ -329,7 +330,7 @@ header { ...@@ -329,7 +330,7 @@ header {
@media (max-width: 799px) { @media (max-width: 799px) {
margin: 10px 8px 0px 8px; margin: 10px 8px 0px 8px;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
} }
&>div { &>div {
......
...@@ -30,12 +30,6 @@ ...@@ -30,12 +30,6 @@
@yield('results') @yield('results')
</div> </div>
@endif @endif
<div id="feedback" style="width:50%;margin-left:25%;position: relative; top:10px;" class="alert alert-danger alert-dismissable">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
{!! trans('kontakt.form.1') !!}</a>
</strong>
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter']) @include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script> <script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
<div class="searchbar-options-arrow"></div> <div class="searchbar-options-arrow"></div>
<div class="search-button-container"> <div class="search-button-container">
<div class="search-add-focus js-only"> <div class="search-add-focus js-only">
<div class="search-option-descriptor">
<label for="addFocusBtn">{{{ trans('index.tooltips.add-focus') }}}</label>
</div>
<button type="button" id="addFocusBtn"> <button type="button" id="addFocusBtn">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
</button> </button>
......
@if ($type === 'startpage' || $type === 'subpage') @if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage')
<footer class="{{ $id }} noprint"> <footer class="{{ $id }} noprint">
<div id="info"> <div id="info">
<span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a></span> <span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a></span>
<span class="hidden-xs">{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a></span> <span class="hidden-xs">{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a></span>
</div> </div>
</footer> </footer>
@elseif ($type === 'resultpage')
<footer class="footer-resultpage">
<div>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div>
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
</footer>
@endif @endif
\ No newline at end of file
...@@ -2,80 +2,7 @@ ...@@ -2,80 +2,7 @@
{{-- Don't forget <script type="text/javascript" src="{{ elixir('js/searchbar.js') }}"></script> --}} {{-- Don't forget <script type="text/javascript" src="{{ elixir('js/searchbar.js') }}"></script> --}}
<fieldset> <fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8"> <form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<div class="searchbar {{$class or ''}}"><!-- <div class="searchbar {{$class or ''}}">
<div class="search-focus-selector">
<button type="button" id="toggleOptBtn" class="js-only" data-mode="o">
<i class="fa fa-sliders"></i>
</button>
<div class="no-js">
<div class="search-settings">
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
<i class="fa fa-cog" aria-hidden="true"></i>
</a>
<div class="searchbar-tooltip">
<div class="searchbar-tooltip-arrow"></div>
<div class="searchbar-tooltip-content">
<p>{{{ trans('index.tooltips.settings') }}}</p>
</div>
</div>
</div>
</div>
<select id="focus-select" name="focus" style="font-family: FontAwesome, sans-serif;">
<option value="web" style="font-family: FontAwesome, sans-serif;" selected>&#xf0ac; Web</option>
<option value="nachrichten" style="font-family: FontAwesome, sans-serif;">&#xf0a1; Nachrichten</option>
<option value="wissenschaft" style="font-family: FontAwesome, sans-serif;">&#xf15c; Wissenschaft</option>
<option value="produktsuche" style="font-family: FontAwesome, sans-serif;">&#xf07a; Produkte</option>
<option value="maps" style="font-family: FontAwesome, sans-serif;">&#xf279; Karten</option>
</select>
<div class="search-option-frame hide">
<div class="searchbar-options-arrow"></div>
<div class="search-button-container">
<div class="search-add-focus js-only">
<div class="search-option-descriptor">
<label for="addFocusBtn">{{{ trans('index.tooltips.add-focus') }}}</label>
</div>
<button type="button" id="addFocusBtn">
<i class="fa fa-plus"></i>
</button>
<div class="searchbar-tooltip">
<div class="searchbar-tooltip-arrow"></div>
<div class="searchbar-tooltip-content">
<p>{{{ trans('index.tooltips.add-focus') }}}</p>
</div>
</div>
</div>
<div class="search-edit-focus js-only">
<div class="search-option-descriptor">
<label for="editFocusBtn">{{{ trans('index.tooltips.edit-focus') }}}</label>
</div>
<button type="button" id="editFocusBtn" title="@lang('index.edit-focus')">
<i class="fa fa-wrench"></i>
</button>
<div class="searchbar-tooltip">
<div class="searchbar-tooltip-arrow"></div>
<div class="searchbar-tooltip-content">
<p>{{{ trans('index.tooltips.edit-focus') }}}</p>
</div>
</div>
</div>
{{-- Die Struktur sieht hier leicht anders aus, da man keine labels zum klicken von links benutzen kann --}}
<div class="search-settings">
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
<div class="search-option-descriptor">
<label for="settings-btn">{{{ trans('index.tooltips.settings') }}}</label>
</div>
<i class="fa fa-cog" aria-hidden="true"></i>
</a>
<div class="searchbar-tooltip">
<div class="searchbar-tooltip-arrow"></div>
<div class="searchbar-tooltip-content">
<p>{{{ trans('index.tooltips.settings') }}}</p>
</div>
</div>
</div>
</div>
</div>
</div>-->
<div class="search-input-submit"> <div class="search-input-submit">
<div class="search-input"> <div class="search-input">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}"> <input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
......
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