From b95a6f57bf3189a8a45f68901833ba159d90b47e Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 31 Oct 2014 12:35:19 -0400
Subject: [PATCH 1/2] Removing duplicate popup form styles

---
 themes/baggy/css/main.css | 58 +++++++++++----------------------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 873d179..b2ddf35 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -540,7 +540,8 @@ footer a {
   2.1 = "save a link" related styles
   ========================================================================== */
 
-#bagit-form, #search-form {
+#bagit-form,
+#search-form {
   background: rgba(0,0,0,0.5);
   position: absolute;
   top: 0;
@@ -555,18 +556,18 @@ footer a {
   border-left: 1px #EEE solid;
 }
 
-#bagit-form form, #search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
+	#bagit-form form,
+	#search-form form {
+		background: #FFF;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		border: 10px solid #000;
+		width: 400px;
+		height: 200px;
+		padding: 2em;
+	}
 
 #bagit-form-form .addurl {
 	margin-left: 0;
@@ -645,37 +646,10 @@ a.add-to-wallabag-link-after:after {
 /* ==========================================================================
   2.2 = "search for articles" popup div related styles
   ========================================================================== */
-#search-form {
-  background: rgba(0,0,0,0.5);
-  position: absolute;
-  top: 0;
-  left: 10em;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  margin-top: -30%;
-  padding: 2em;
-  display: none;
-  border-left: 1px #EEE solid;
-}
-
-#search-form form {
-  background: #FFF;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 20;
-  border: 10px solid #000;
-  width: 400px;
-  height: 200px;
-  /* margin: -150px 0 0 -300px; */
-  padding: 2em;
-}
 
 #submit-search{
-margin-left: 4em;
-margin-top:1em;
+	margin-left: 4em;
+	margin-top: 1em;
 }
 
 /* ==========================================================================

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: [PATCH 2/2] Making visual styling of search and bag it popup forms
 more consistent

---
 themes/baggy/_pocheit-form.twig |  2 +-
 themes/baggy/_search-form.twig  |  7 ++++---
 themes/baggy/css/main.css       | 19 ++++---------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 409707f..88d3275 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,4 +1,4 @@
-<div id="bagit-form" class="messages info">
+<div id="bagit-form" class="messages info popup-form">
     <form method="get" action="index.php" target="_blank" id="bagit-form-form">
         <h2>{% trans "Save a link" %}</h2>
         <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 35f3a99..b1e17dd 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>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index b2ddf35..2f3af95 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -540,8 +540,7 @@ footer a {
   2.1 = "save a link" related styles
   ========================================================================== */
 
-#bagit-form,
-#search-form {
+.popup-form {
   background: rgba(0,0,0,0.5);
   position: absolute;
   top: 0;
@@ -550,14 +549,13 @@ footer a {
   height: 100%;
   width: 100%;
   margin: 0;
-  margin-top: -30%;
+  margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
   padding: 2em;
   display: none;
   border-left: 1px #EEE solid;
 }
 
-	#bagit-form form,
-	#search-form form {
+	.popup-form form {
 		background: #FFF;
 		position: absolute;
 		top: 0;
@@ -643,15 +641,6 @@ a.add-to-wallabag-link-after:after {
   font-size: 0.9em;
 }
 
-/* ==========================================================================
-  2.2 = "search for articles" popup div related styles
-  ========================================================================== */
-
-#submit-search{
-	margin-left: 4em;
-	margin-top: 1em;
-}
-
 /* ==========================================================================
    3 = Pictos
    ========================================================================== */
@@ -1031,7 +1020,7 @@ pre code {
     display: none;
   }
 
-  #bagit-form, #search-form {
+  .popup-form {
     left: 0;
   }
 }