From fe459959b07c8903bdabc4dbc286f04b8ccf91b9 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 10 Oct 2017 11:17:51 +0200
Subject: [PATCH] Redesigned Research Bar
---
public/css/theme.css.php | 5 ----
.../assets/less/metager/result-page.less | 23 ++++++++++++--
.../views/layouts/researchandtabs.blade.php | 30 ++++++++-----------
3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/public/css/theme.css.php b/public/css/theme.css.php
index 33234e486..43a8c01dc 100644
--- a/public/css/theme.css.php
+++ b/public/css/theme.css.php
@@ -38,11 +38,6 @@ if (isset($_GET['r']) && isset($_GET['g']) && isset($_GET['b']) && isset($_GET['
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
}
-.navbar.navbar-resultpage {
- border-bottom: 2px solid <?=$color?>;
- box-shadow: none;
-}
-
.lSPrev > i, .lSNext > i {
color: <?=$color?>;
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index ec5adf0e4..a20f2b60e 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -93,6 +93,8 @@ footer {
.navbar-resultpage {
background-color: @navbar-resultpage-background-color;
position: absolute;
+ border-bottom: 2px solid #ff8000;
+ padding-bottom: 10px;
&>ul>li {
padding-left: 0;
padding-right: 0;
@@ -295,21 +297,36 @@ a {
border: 1px dotted black;
}
+#logo-searchbar-container {
+ display: flex;
+}
+
+.mg-logo {
+ color: #ff8000;
+ font-family: Liberation Sans, sans-serif;
+ padding: 5px 30px 0px 0px;
+}
+
.searchbar {
+ margin-top: 5px;
display: flex;
+ border-left: #bbb solid 1px;
input {
border: none;
- box-shadow: none;
+ box-shadow: none !important;
+ border: white solid 1px;
&:focus {
- border: #999 solid 1px;
+ border: #bbb dotted 1px;
}
}
button {
- color: #999;
+ color: #bbb;
+ font-size: 20px;
}
}
.result {
+ margin-top: 20px;
margin-bottom: 40px;
width: 100%;
&>.resultInformation {
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 3d26cac5c..366485d49 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -12,23 +12,19 @@
<header id="research" class="row">
<nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
<div class="container">
- <div class="row">
- <div class="col-xs-3 logo dense-col">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
- </div>
- <div class="col-xs-9 dense-col">
- <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form search-bar-input" id="submitForm">
- <div class="searchbar">
- <input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
- <button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
- </div>
- @foreach( $metager->request->all() as $key => $value)
- @if($key !== "eingabe" && $key !== "page" && $key !== "next")
- <input type='hidden' name='{{ $key }}' value='{{ $value }}' form='submitForm' />
- @endif
- @endforeach
- </form>
- </div>
+ <div class="row" id="logo-searchbar-container">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
+ <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form search-bar-input" id="submitForm">
+ <div class="searchbar">
+ <input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
+ <button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
+ </div>
+ @foreach( $metager->request->all() as $key => $value)
+ @if($key !== "eingabe" && $key !== "page" && $key !== "next")
+ <input type='hidden' name='{{ $key }}' value='{{ $value }}' form='submitForm' />
+ @endif
+ @endforeach
+ </form>
</div>
</div>
</nav>
--
GitLab