3 files changed, 9 insertions, 19 deletions

diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 409707f0..88d32757 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 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>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index b2ddf355..2f3af95e 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;
@@ -644,15 +642,6 @@ a.add-to-wallabag-link-after:after {
 }
 
 /* ==========================================================================
-  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;
   }
 }