5 files changed, 36 insertions, 28 deletions

diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 88d32757..bf2ae903 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,7 +1,7 @@
 <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>
+        <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
         <span id="add-link-result"></span>
diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index b1e17dd8..77cd8461 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>
+        <h2>{%trans "Search" %}</h2>
+        <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>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 2f3af95e..93294359 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -571,24 +571,32 @@ footer a {
         margin-left: 0;
 }
 
-.popup-close {
+.closeMessage,
+.close-button {
   background: #000;
   color: #FFF;
-        font-size: 1.4em;
-        line-height: 1.6em;
+        font-size: 1.2em;
+        line-height: 1.6;
         width: 1.6em;
         height: 1.6em;
         text-align: center;
   text-decoration: none;
+}
+        .closeMessage:hover,
+        .closeMessage:focus,
+        .close-button:hover,
+        .close-button:focus {
+                background: #999;
+                color: #000;
+        }
+
+.close-button--popup {
         display: inline-block;
         position: absolute;
         top: 0;
         right: 0;
+        font-size: 1.4em;
 }
-        .popup-close:hover {
-                background: #999;
-                color: #000;
-        }
 
 .active-current {
   background-color: #999;
@@ -750,18 +758,6 @@ a.add-to-wallabag-link-after:after {
 
 .messages > * { display: inline-block;}
 
-.closeMessage {
-  background: #000;
-  color: #FFF;
-  padding: 0.2em 0.5em;
-  text-decoration: none;
-}
-
-  .closeMessage:hover, .closeMessage:focus {
-    background: #FFF;
-    color: #000;
-  }
-
 .warning {
   /* font-size: 3em;
   color: #999;
@@ -1022,6 +1018,14 @@ pre code {
 
   .popup-form {
     left: 0;
+    width: 100%;
+    border-left: none;
+  }
+
+  .popup-form form,
+  #bagit-form form,
+  #search-form form {
+    width: 100%;
   }
 }
 
diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css
index 3ad4e34e..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/css/messages.css
@@ -8,11 +8,6 @@
     border-radius: 4px;
 }
 
-/* Search form message needs a little more width, depending on translations */
-#search-form {
-    width: 420px;
-}
-
 .messages a.closeMessage {
     display: none;
     float: right;
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index e254d481..b25373d6 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after {
   padding-left: 10px;
 }
 
+/* ==========================================================================
+        "Search" popup div related styles
+        ========================================================================== */
+
+/* Search form message needs a little more width, depending on translations */
+#search-form {
+    width: 420px;
+}
+
 .opacity03 {
   /*opacity: 0.3;*/
 }
@@ -435,4 +444,4 @@ pre code {
                 font-family: "Courier New", Courier, monospace;
                 border: 1px solid #ddd;
                 font-size: 0.96em;
-}
\ No newline at end of file
+}