Merging changes with dev

diff --cc themes/baggy/_pocheit-form.twig
index 88d3275741d517e08385fcee2e858b5671284ced,2068cd31c625238d7ea4046ccb5da1dbb7f293b5..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 --cc themes/baggy/css/main.css
Simple merge