merge

diff --combined themes/baggy/_pocheit-form.twig
index 2068cd31c625238d7ea4046ccb5da1dbb7f293b5,88d3275741d517e08385fcee2e858b5671284ced..bf2ae903769637405f2fadfecf03200d4a19e91f
--- 1/themes/baggy/_pocheit-form.twig
--- 2/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@@ -1,7 -1,7 +1,7 @@@
- <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>
 +        <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 --combined themes/baggy/_search-form.twig
index aec902ff964a2cd7e3f91be7e8c4eb1fa7e0d04f,b1e17dd8807fdc51a1793315958c515baebc7a0f..77cd846102dda0cbc224f7f73b26c4c2d824c9da
--- 1/themes/baggy/_search-form.twig
--- 2/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@@ -1,8 -1,9 +1,9 @@@
- <div id="search-form" class="messages info">
+ <div id="search-form" class="messages info popup-form">
  <form method="get" action="index.php">
-         <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>
++        <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>
-         <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 --combined themes/baggy/css/main.css
index 4e3404c14deb5c5110e46991a5e8f21a23411204,2f3af95ecdcbaea6d24358652f575953cc9e0d6f..93294359b0d9b023341bf868cfe755dc094790d7
--- 1/themes/baggy/css/main.css
--- 2/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@@ -540,7 -540,7 +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;
@@@ -549,55 -549,46 +549,54 @@@
    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 {
-   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;
- }
+       .popup-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;
  }
  
 -.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;
@@@ -650,42 -641,6 +649,6 @@@ a.add-to-wallabag-link-after:after 
    font-size: 0.9em;
  }
  
- /* ==========================================================================
-   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;
- }
- 
  /* ==========================================================================
     3 = Pictos
     ========================================================================== */
@@@ -795,6 -750,18 +758,6 @@@
  
  .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;
@@@ -1053,16 -1020,8 +1016,16 @@@ pre code 
      display: none;
    }
  
-   .popup-form, #bagit-form, #search-form {
+   .popup-form {
      left: 0;
 +    width: 100%;
 +    border-left: none;
 +  }
 +
 +  .popup-form form,
 +  #bagit-form form,
 +  #search-form form {
 +    width: 100%;
    }
  }