From f087967e4ab87356f426cd5010c7e815ef39a067 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Wed, 11 Oct 2017 11:48:30 +0200
Subject: [PATCH] Erstes Redesign des Suchformulars

---
 public/css/theme.css.php                      |  5 +--
 resources/assets/less/default.less            |  2 -
 .../assets/less/metager/static-pages.less     | 39 +++++++++++--------
 resources/views/index.blade.php               | 33 ++++++----------
 4 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/public/css/theme.css.php b/public/css/theme.css.php
index ba4c6c00..2578981b 100644
--- a/public/css/theme.css.php
+++ b/public/css/theme.css.php
@@ -20,9 +20,8 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
 
 
 #mglogo > a {
-	background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%);
-    background-color: transparent;
-    color: white;
+	color: rgb(255,128,0);
+    font-size: 90px;
 }
 
 .logo h1{
diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less
index e6ed4400..f64afa38 100644
--- a/resources/assets/less/default.less
+++ b/resources/assets/less/default.less
@@ -3,8 +3,6 @@
 @import "./variables-default.less";
 
 #mglogo>a {
-    background-color: rgb(255, 128, 0);
-    color: white;
 }
 
 .logo h1 {
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index d5817d2c..25da7ae2 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -122,7 +122,8 @@ ul.metager-dropdown-menu {
 }
 
 #mglogo {
-    width: 100%;
+    color: rgb(255,128,0);
+    text-shadow: 2px 2px 10px rgba(150, 150, 150, 1);
     text-align: center;
 }
 
@@ -275,7 +276,6 @@ ul.metager-dropdown-menu {
 
 #mglogo>a {
     display: block;
-    width: 200px;
     text-decoration: none;
     font-size: 1.1em;
     font-family: Liberation Sans, sans-serif;
@@ -443,20 +443,15 @@ textarea#message {
     margin-right: 0;
 }
 
-.mg-panel {
-    text-align: left;
-    margin: 0 auto;
-    margin-top: 20px;
-    padding: 10px 20px;
-    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;
-    }
+select[name=focus] {
+	font-family: FontAwesome, sans-serif;
+    padding: 0.5em;
+    border: 0;
+    border-radius: 0;
+}
+
+select[name=focus] > option {
+	font-family: FontAwesome, sans-serif;
 }
 
 .input-group-addon {
@@ -675,7 +670,19 @@ label a {
     }
 }
 
+#submit-inputgroup {
+	background-color: inherit;
+    border-left: 0;
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+input[name=eingabe] {
+	border-right: 0;
+	box-shadow: inset 0 1px 0px rgba(0, 0, 0, 0.075);
+}
+
 footer {
+	position: absolute;
     margin: 30px 0px;
     bottom: 0;
     width: 100%;
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 5e24514c..7bd96060 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -205,7 +205,7 @@
 	</div>
 	<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
 	<!-- Create the focus selection and options -->
-	<div id="foki" class="startpage-foki">
+	<!-- <div id="foki" class="startpage-foki">
 		<div class="focus">
 			<input id="web" class="focus-radio hide" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
 			<label id="web-label" class="focus-label" for="web">
@@ -261,27 +261,18 @@
 			<i class="fa fa-cog" aria-hidden="true"></i>
 			</a>
 		</div>
-	</div>
+	</div>-->
 		<fieldset>
 			<form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
 				<div class="input-group">
 					<div class="input-group-addon">
-						<button type="button" data-toggle="popover" data-html="true" data-container="body" title="{{ trans('index.design') }}" data-content='&lt;ul id="color-chooser" class="list-inline list-unstyled"&gt;
-							&lt;li &gt;&lt;a id="standard" data-rgba="255,194,107,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="standardHard" data-rgba="255,128,0,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="blue" data-rgba="164,192,230,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="blueHard" data-rgba="2,93,140,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="green" data-rgba="177,226,163,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="greenHard" data-rgba="127,175,27,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="red" data-rgba="255,92,92,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="redHard" data-rgba="255,0,0,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="pink" data-rgba="255,196,246,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="pinkHard" data-rgba="254,67,101,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="black" data-rgba="238,238,238,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-							&lt;li &gt;&lt;a id="blackHard" data-rgba="50,50,50,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
-						&lt;/ul&gt;'>
-							<i class="fa fa-tint" aria-hidden="true"></i>
-						</button>
+						<select name="focus" style="font-family: FontAwesome, sans-serif;">
+							<option value="web" style="font-family: FontAwesome, sans-serif;" selected >&#xf0ac; Websuche</option>
+							<option value="nachrichten" style="font-family: FontAwesome, sans-serif;" >&#xf0a1; Nachrichtensuche</option>
+							<option value="wissenschaft" style="font-family: FontAwesome, sans-serif;" >&#xf15c; Wissenschaftssuche</option>
+							<option value="produktsuche" style="font-family: FontAwesome, sans-serif;" >&#xf07a; Produktsuche</option>
+							<option value="maps" style="font-family: FontAwesome, sans-serif;" >&#xf279; Kartensuche</option>
+						</select>
 					</div>
 					<input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
 					<input type="hidden" name="encoding" value="utf8">
@@ -296,7 +287,7 @@
 						<input type="hidden" name={{ $fp }} value="on">
 					@endforeach
 					<input type="hidden" name="theme" value={{ $theme }}>
-					<div class="input-group-addon">
+					<div class="input-group-addon" id="submit-inputgroup">
 						<button type="submit">
 							<i class="fa fa-search" aria-hidden="true"></i>
 						</button>
@@ -304,7 +295,7 @@
 				</div>
 			</form>
 		</fieldset>
-		<ul class="list-inline searchform-bonus">
+		<ul class="list-inline searchform-bonus hidden">
 			<li id="plug"
 			@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
 				class="hidden"
@@ -322,7 +313,7 @@
 @endsection
 
 @section('optionalContent')
-	<section id="moreInformation" class="hidden-xs">
+	<section id="moreInformation" class="hidden-xs hidden">
 		<h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
 		<div class="row">
 			<div id="sponsors" class="col-sm-6">
-- 
GitLab