From 09d8baacac5b2d04478c8896379a0f0c48db0888 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 10 Oct 2017 10:34:11 +0200
Subject: [PATCH] Added new Search bar WIP
---
public/css/theme.css.php | 8 ------
.../assets/less/metager/result-page.less | 25 +++++++++++++++----
resources/assets/less/metager/variables.less | 12 ++++++++-
.../views/layouts/researchandtabs.blade.php | 7 ++----
4 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/public/css/theme.css.php b/public/css/theme.css.php
index 0d15fb1ff..33234e486 100644
--- a/public/css/theme.css.php
+++ b/public/css/theme.css.php
@@ -10,14 +10,6 @@ if (isset($_GET['r']) && isset($_GET['g']) && isset($_GET['b']) && isset($_GET['
@CHARSET "UTF-8";
-input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus {
- outline-color: <?=$color?>;
- -webkit-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
- -moz-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
- box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
- border-color: <?=$colorRGBA?>;
-}
-
#mglogo > a {
background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%);
background-color: transparent;
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index d20107f0d..893389de2 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -299,8 +299,22 @@ a {
border: 1px dotted black;
}
+.searchbar {
+ display: flex;
+ input {
+ border: none;
+ box-shadow: none;
+ &:focus {
+ border: #999 solid 1px;
+ }
+ }
+ button {
+ color: #999;
+ }
+}
+
.result {
- margin-bottom: 10px;
+ margin-bottom: 40px;
width: 100%;
&>.number {
font-size: 15px;
@@ -324,7 +338,7 @@ a {
.title {
color: @result-title-color;
text-decoration: none;
- font-size: 14px;
+ font-size: 17px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
@@ -334,7 +348,7 @@ a {
text-overflow: ellipsis;
}
.link {
- font-size: 13px;
+ font-size: 15px;
margin: 0;
line-height: 1.5;
&>div {
@@ -365,7 +379,7 @@ a {
.description {
margin-bottom: 3px;
color: @result-description-color;
- font-size: 14px;
+ font-size: 15px;
line-height: 1.3;
clear: both;
.date {
@@ -657,7 +671,8 @@ a {
}
.quicktip-summary {
h1 {
- font-size: 16px;
+ font-size: 17px;
+ font-size: 15px;
font-weight: bold;
}
}
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index 41f06a020..3cec9f7ed 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -46,4 +46,14 @@
@base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
-@base-new-feature-badge-background-color: #f80;
\ No newline at end of file
+@base-new-feature-badge-background-color: #f80;
+// Bootstrap Ersatz
+/*
+@screen-sm-min: 768px;
+@screen-md-min: 992px;
+@screen-lg-min: 1200px;
+@screen-xs-max: (@screen-sm-min - 1);
+@screen-sm-max: (@screen-md-min - 1);
+@screen-md-max: (@screen-lg-min - 1);
+@grid-gutter-width: 30px;
+*/
\ No newline at end of file
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 5c1ed08e4..118384eac 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -18,12 +18,9 @@
</div>
<div class="col-xs-9 dense-col">
<form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
- <div class="input-group">
+ <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 />
- <div class="input-group-addon">
- <button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i>
- </button>
- </div>
+ <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")
--
GitLab