fix merge errors

diff --git a/themes/baggy/_search-form.twig b/themes/baggy/_search-form.twig
index 77cd846102dda0cbc224f7f73b26c4c2d824c9da..4add929427821718cb7d101161e18de05e08de63 100644 (file)
--- 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="close-button--popup close-button">&times;</a>
+       <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>
         <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 93294359b0d9b023341bf868cfe755dc094790d7..ce3148606dc894ae5acb6dd6c36fa3094fd7468b 100755 (executable)
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -1016,7 +1016,7 @@ pre code {
     display: none;
   }
 
-  .popup-form {
+  .popup-form, #bagit-form, #search-form {
     left: 0;
     width: 100%;
     border-left: none;