From 5212563de6cfd68e3a16a341201d0976a1f20c3b Mon Sep 17 00:00:00 2001
From: Kim <kim@suma-ev.de>
Date: Mon, 14 Sep 2020 10:18:21 +0200
Subject: [PATCH] Fix mini search form
---
resources/less/metager/general/forms.less | 20 +++++++++++++++++++-
resources/less/metager/general/general.less | 1 +
resources/views/assoziator/asso.blade.php | 7 ++-----
resources/views/zitatsuche.blade.php | 8 +-------
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/resources/less/metager/general/forms.less b/resources/less/metager/general/forms.less
index 64b6dc271..bc7dd9702 100644
--- a/resources/less/metager/general/forms.less
+++ b/resources/less/metager/general/forms.less
@@ -1,4 +1,22 @@
-//
+// Newly defined MetaGer form styles
+.search-btn-mini{
+ border: solid 1px;
+ height: 34px;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ border-color: #ccc;
+ vertical-align: middle;
+ border-left-style: none;
+}
+.search-input-mini{
+ border-top-right-radius: 0px!important;
+border-bottom-right-radius: 0px!important;
+}
+
+
+
+
+
// Forms (copied from Bootstrap)
// --------------------------------------------------
diff --git a/resources/less/metager/general/general.less b/resources/less/metager/general/general.less
index 0c6aabad4..1c5e9c683 100644
--- a/resources/less/metager/general/general.less
+++ b/resources/less/metager/general/general.less
@@ -1,3 +1,4 @@
@import "./base.less";
@import "./cards.less";
@import "./specific.less";
+@import "./forms.less";
diff --git a/resources/views/assoziator/asso.blade.php b/resources/views/assoziator/asso.blade.php
index 9ae7115ce..fdeeb6e92 100644
--- a/resources/views/assoziator/asso.blade.php
+++ b/resources/views/assoziator/asso.blade.php
@@ -26,11 +26,8 @@
<div class="card-heavy">
<p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/datenschutz') }}" target="_blank">{{ trans('asso.1.2') }}</a>{{ trans('asso.1.3') }}.</p>
- <form method="post">
- <div class="input-group">
- <input type="text" class="form-control" placeholder="{{ trans('asso.search.placeholder') }}" @if(isset($keywords)) value="{{$keywords}}" @endif name="q" required autofocus/>
- <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
- </div>
+ <form method="post" class="form-inline">
+ <input type="text" class="form-control search-input-mini" placeholder="{{ trans('asso.search.placeholder') }}" @if(isset($keywords)) value="{{$keywords}}" @endif name="q" required autofocus/><button type="submit" class="search-btn-mini"><i class="fa fa-search" aria-hidden="true"></i></button>
</form>
</div>
@if(isset($words))
diff --git a/resources/views/zitatsuche.blade.php b/resources/views/zitatsuche.blade.php
index 78e5d978b..ef675254d 100644
--- a/resources/views/zitatsuche.blade.php
+++ b/resources/views/zitatsuche.blade.php
@@ -7,13 +7,7 @@
<div class="card-light">
<p>{{ trans('zitatsuche.subtitle') }}</p>
<form id="searchForm" class="form-inline" accept-charset="UTF-8">
- <div class="form-group">
- <label class="sr-only" for="q">{{ trans('zitatsuche.search-label') }}</label>
- <div class="input-group">
- <input type="text" class="form-control" id="q" name="q" placeholder="Suchworte" value="{{ $q }}">
- <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
- </div>
- </div>
+ <input type="text" class="form-control search-input-mini" id="q" name="q" placeholder="Suchworte" value="{{ $q }}"><button type="submit" class="search-btn-mini"><i class="fa fa-search" aria-hidden="true"></i></button>
</form>
@if($q !== "")
<hr />
--
GitLab