Skip to content

GitLab

MetaGer
MetaGer
Commit f087967e authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files
Options

Erstes Redesign des Suchformulars

parent a7b17a62
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 42 deletions
public/css/theme.css.php
View file @ f087967e
...@@ -20,9 +20,8 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] ...@@ -20,9 +20,8 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
#mglogo > a { #mglogo > a {
background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%); color: rgb(255,128,0);
background-color: transparent; font-size: 90px;
color: white;
} }
.logo h1{ .logo h1{
......
resources/assets/less/default.less
View file @ f087967e
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
@import "./variables-default.less"; @import "./variables-default.less";
#mglogo>a { #mglogo>a {
background-color: rgb(255, 128, 0);
color: white;
} }
.logo h1 { .logo h1 {
......
resources/assets/less/metager/static-pages.less
View file @ f087967e
...@@ -122,7 +122,8 @@ ul.metager-dropdown-menu { ...@@ -122,7 +122,8 @@ ul.metager-dropdown-menu {
} }
#mglogo { #mglogo {
width: 100%; color: rgb(255,128,0);
text-shadow: 2px 2px 10px rgba(150, 150, 150, 1);
text-align: center; text-align: center;
} }
...@@ -275,7 +276,6 @@ ul.metager-dropdown-menu { ...@@ -275,7 +276,6 @@ ul.metager-dropdown-menu {
#mglogo>a { #mglogo>a {
display: block; display: block;
width: 200px;
text-decoration: none; text-decoration: none;
font-size: 1.1em; font-size: 1.1em;
font-family: Liberation Sans, sans-serif; font-family: Liberation Sans, sans-serif;
...@@ -443,20 +443,15 @@ textarea#message { ...@@ -443,20 +443,15 @@ textarea#message {
margin-right: 0; margin-right: 0;
} }
.mg-panel { select[name=focus] {
text-align: left; font-family: FontAwesome, sans-serif;
margin: 0 auto; padding: 0.5em;
margin-top: 20px; border: 0;
padding: 10px 20px; border-radius: 0;
margin-bottom: 0; }
background-color: @mg-panel-background-color;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); select[name=focus] > option {
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); font-family: FontAwesome, sans-serif;
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
@media (max-width: 768px) {
margin: 0px;
box-shadow: none;
}
} }
.input-group-addon { .input-group-addon {
...@@ -675,7 +670,19 @@ label a { ...@@ -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 { footer {
position: absolute;
margin: 30px 0px; margin: 30px 0px;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
......
resources/views/index.blade.php
View file @ f087967e
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
</div> </div>
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1> <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<!-- Create the focus selection and options --> <!-- Create the focus selection and options -->
<div id="foki" class="startpage-foki"> <!-- <div id="foki" class="startpage-foki">
<div class="focus"> <div class="focus">
<input id="web" class="focus-radio hide" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required=""> <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"> <label id="web-label" class="focus-label" for="web">
...@@ -261,27 +261,18 @@ ...@@ -261,27 +261,18 @@
<i class="fa fa-cog" aria-hidden="true"></i> <i class="fa fa-cog" aria-hidden="true"></i>
</a> </a>
</div> </div>
</div> </div>-->
<fieldset> <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"> <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">
<div class="input-group-addon"> <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; <select name="focus" style="font-family: FontAwesome, sans-serif;">
&lt;li &gt;&lt;a id="standard" data-rgba="255,194,107,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; <option value="web" style="font-family: FontAwesome, sans-serif;" selected >&#xf0ac; Websuche</option>
&lt;li &gt;&lt;a id="standardHard" data-rgba="255,128,0,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; <option value="nachrichten" style="font-family: FontAwesome, sans-serif;" >&#xf0a1; Nachrichtensuche</option>
&lt;li &gt;&lt;a id="blue" data-rgba="164,192,230,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; <option value="wissenschaft" style="font-family: FontAwesome, sans-serif;" >&#xf15c; Wissenschaftssuche</option>
&lt;li &gt;&lt;a id="blueHard" data-rgba="2,93,140,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; <option value="produktsuche" style="font-family: FontAwesome, sans-serif;" >&#xf07a; Produktsuche</option>
&lt;li &gt;&lt;a id="green" data-rgba="177,226,163,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; <option value="maps" style="font-family: FontAwesome, sans-serif;" >&#xf279; Kartensuche</option>
&lt;li &gt;&lt;a id="greenHard" data-rgba="127,175,27,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; </select>
&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>
</div> </div>
<input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}"> <input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
<input type="hidden" name="encoding" value="utf8"> <input type="hidden" name="encoding" value="utf8">
...@@ -296,7 +287,7 @@ ...@@ -296,7 +287,7 @@
<input type="hidden" name={{ $fp }} value="on"> <input type="hidden" name={{ $fp }} value="on">
@endforeach @endforeach
<input type="hidden" name="theme" value={{ $theme }}> <input type="hidden" name="theme" value={{ $theme }}>
<div class="input-group-addon"> <div class="input-group-addon" id="submit-inputgroup">
<button type="submit"> <button type="submit">
<i class="fa fa-search" aria-hidden="true"></i> <i class="fa fa-search" aria-hidden="true"></i>
</button> </button>
...@@ -304,7 +295,7 @@ ...@@ -304,7 +295,7 @@
</div> </div>
</form> </form>
</fieldset> </fieldset>
<ul class="list-inline searchform-bonus"> <ul class="list-inline searchform-bonus hidden">
<li id="plug" <li id="plug"
@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi') @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
class="hidden" class="hidden"
...@@ -322,7 +313,7 @@ ...@@ -322,7 +313,7 @@
@endsection @endsection
@section('optionalContent') @section('optionalContent')
<section id="moreInformation" class="hidden-xs"> <section id="moreInformation" class="hidden-xs hidden">
<h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1> <h1 class="hidden">{{ trans('index.sponsors.head.1') }}</h1>
<div class="row"> <div class="row">
<div id="sponsors" class="col-sm-6"> <div id="sponsors" class="col-sm-6">
......
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