From cd271fc485975e3089a85902f28e674065c5783d Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Thu, 30 Oct 2014 16:00:18 -0400
Subject: Making the close button more visually consistent on the menu popup
 forms

---
 themes/baggy/_search-form.twig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'themes/baggy/_search-form.twig')

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 7b2c7082..45660b75 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,7 +1,8 @@
 <div id="search-form" class="messages info">
 <form method="get" action="index.php">
+        <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
         <input type="hidden" name="view" value="search"></input>
-        <label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
+        <label>{% trans "Search" %}</label>: <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
         <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
 </form>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 1087b3cb4ef79ff5f1599ebe479785f9d2e90c35 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 31 Oct 2014 09:53:01 -0400
Subject: Adding right margin to labels (to compensate for now-missing left
 margin on input fields)

---
 themes/baggy/_search-form.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy/_search-form.twig')

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 45660b75..35f3a994 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -2,7 +2,7 @@
 <form method="get" action="index.php">
         <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
         <input type="hidden" name="view" value="search"></input>
-        <label>{% trans "Search" %}</label>: <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
+        <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
         <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
 </form>
 </div>
-- 
cgit v1.2.3


From 827bd1f8990e18e1978c95484680d51524ca19bf Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 31 Oct 2014 11:10:38 -0400
Subject: Standardizing class names and styles for close buttons

---
 themes/baggy/_search-form.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy/_search-form.twig')

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 35f3a994..aec902ff 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,6 +1,6 @@
 <div id="search-form" class="messages info">
 <form method="get" action="index.php">
-        <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
+        <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="view" value="search"></input>
         <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
         <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
-- 
cgit v1.2.3


From 4bc70ed4012bcefa6a3a01a051fcbd18456403df Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 31 Oct 2014 12:48:35 -0400
Subject: Making visual styling of search and bag it popup forms more
 consistent

---
 themes/baggy/_search-form.twig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'themes/baggy/_search-form.twig')

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 35f3a994..b1e17dd8 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,8 +1,9 @@
-<div id="search-form" class="messages info">
+<div id="search-form" class="messages info popup-form">
 <form method="get" action="index.php">
+				<h2>{%trans "Search" %}</h2>
         <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
         <input type="hidden" name="view" value="search"></input>
-        <label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
-        <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
+        <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
+        <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>
 </form>
 </div>
-- 
cgit v1.2.3


From 40800c97b29b23999d01dd245a866de34f487338 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 31 Oct 2014 14:34:10 -0400
Subject: Fixing regression in popup close button styling

---
 themes/baggy/_search-form.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/baggy/_search-form.twig')

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 4add9294..73f7951f 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,7 +1,7 @@
 <div id="search-form" class="messages info popup-form">
 <form method="get" action="index.php">
 	<h2>{%trans "Search" %}</h2>
-        <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
+        <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="view" value="search"></input>
         <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
         <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>
-- 
cgit v1.2.3