fixes based on PR review

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2

@@ -179,6 +179,8 @@
   /var/www/securedrop/journalist_app/utils.py r,
   /var/www/securedrop/journalist_templates/_confirmation_modal.html r,
   /var/www/securedrop/journalist_templates/_source_row.html r,
+  /var/www/securedrop/journalist_templates/_sources_confirmation_final_modal.html r,
+  /var/www/securedrop/journalist_templates/_sources_confirmation_modal.html r,
   /var/www/securedrop/journalist_templates/account_edit_hotp_secret.html r,
   /var/www/securedrop/journalist_templates/account_new_two_factor.html r,
   /var/www/securedrop/journalist_templates/admin.html r,

securedrop/journalist_app/utils.py

@@ -99,7 +99,7 @@ def validate_user(
             InvalidPasswordLength) as e:
         current_app.logger.error("Login for '{}' failed: {}".format(
             username, e))
-        login_flashed_msg = error_message if error_message else gettext('Login failed.')
+        login_flashed_msg = error_message if error_message else gettext('<b>Login failed.</b>')
 
         if isinstance(e, LoginThrottledException):
             login_flashed_msg += " "
@@ -123,7 +123,7 @@ def validate_user(
             except Exception:
                 pass
 
-        flash(login_flashed_msg, "error")
+        flash(Markup(login_flashed_msg), "error")
         return None
 
 

securedrop/journalist_templates/_confirmation_modal.html

@@ -1,7 +1,7 @@
 <div id="{{ modal_data.modal_id }}" class="modal-dialog">
   <a href="#close" class="external"></a>
   <div>
-    <a href="#close" title="{{ gettext('Close') }}" class="close"> <img src="{{ url_for('static', filename='i/modal-x-white.png') }}" height="12" width="12"></a>
+    <a href="#close" title="{{ gettext('Close') }}" class="close"> <img src="{{ url_for('static', filename='i/modal-x-white.png') }}" height="24" width="24"></a>
     <h2>{{ modal_data.modal_header }}</h2>
     <p>{{ modal_data.modal_body }}</p>
     {% if modal_data.modal_warning is defined %}

securedrop/journalist_templates/_sources_confirmation_modal.html

@@ -17,7 +17,7 @@
     {{ gettext("What would you like to delete?") }}
     </p>
     <p>
-      <button id="delete-files-and-messages" type="submit" name="action" value="delete-data" class="small btn danger">{{ gettext('Files &amp; Messages') }}</button>
+      <button id="delete-files-and-messages" type="submit" name="action" value="delete-data" class="small btn danger">{{ gettext('Messages and Files') }}</button>
     </p>
     <p>
       <a href="#delete-sources-confirm-modal" id="delete-collections">

securedrop/journalist_templates/col.html

@@ -76,7 +76,7 @@
         {% set modal_data = {
                               "modal_id": "delete-selected-confirmation-modal",
                               "modal_header": gettext('Delete Confirmation'),
-                              "modal_body": gettext('Are you sure you want to delete the selected messages and/or files?'),
+                              "modal_body": gettext('Are you sure you want to delete the selected submissions?'),
                               "cancel_id": "cancel-selected-deletions",
                               "submit_id": "delete-selected",
                               "submit_btn_type": "danger",
@@ -102,7 +102,7 @@ <h3>{{ gettext('Reply') }}</h3>
     <form action="{{ url_for('main.reply') }}" method="post" autocomplete="off">
       <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
       <input type="hidden" name="filesystem_id" value="{{ filesystem_id }}">
-      {{ form.message(id="reply-text-field", rows='5', class="journalist-reply__input") }}
+      {{ form.message(id="reply-text-field", rows='10', class="journalist-reply__input") }}
       <hr class="no-line">
       <button id="reply-button" class="button pull-right" type="submit">{{ gettext('SUBMIT') }}</button>
     </form>
@@ -125,7 +125,7 @@ <h3>{{ gettext('Reply') }}</h3>
     <div class="center highlight">
       <a href="#delete-collection-confirmation-modal" id="delete-collection-link">
         <button type="button" class="danger">
-          {{ gettext('DELETE SOURCE ACCOUNT') }}
+          {{ gettext('Delete Source Account') }}
         </button>
       </a>
     </div>

securedrop/sass/_variables.sass

@@ -9,7 +9,6 @@ $color_error_background: #FFF7F7
 
 $color_success_text_strong: #0ca116
 $color_success_background: #f6ffdf
-r
 $color_notification_background: #F3FCFF
 $color_notification_text_strong: #FFF7F7
 

securedrop/sass/modules/_button.sass

@@ -13,8 +13,6 @@
     text-decoration: none
     font-weight: bold
     font-size: .8em
-    &:not([lang=ar])
-      letter-spacing: 0.2em
     &:lang(ar)
       letter-spacing: 0em
 
@@ -108,11 +106,13 @@
     color: $color_urgent_coral
     background: white
     border: 2px solid $color_urgent_coral
+    font-weight: bold
 
   button.danger:hover, a.btn.danger:hover, .btn.danger:hover
     background: $color_urgent_coral
     border: 2px solid $color_urgent_coral
     color: white
+    font-weight: bold
 
   .option a.btn.block
     margin-bottom: 0px

securedrop/sass/modules/_confirm-modal.sass

@@ -46,7 +46,6 @@
 
   .close
 
-    background: $color_button_blue
     color: white
     line-height: 22px
     position: absolute
@@ -56,5 +55,4 @@
     width: 24px
     text-decoration: none
     font-weight: bold
-    -moz-border-radius: 12px
-    border-radius: 12px
+    border: none

securedrop/sass/modules/_menu-modal.sass

@@ -30,7 +30,7 @@
     div
       position: relative
       margin: 250px auto
-      padding: 20px 20px 20px 40px
+      padding: 10px 20px 10px 20px
       background: white
       -moz-box-shadow: 0px 0px 15px 0px rgba(0,0,0,0.5)
       box-shadow: 0px 0px 15px 0px rgba(0,0,0,0.5)
@@ -43,16 +43,21 @@
       all: unset
       display: none
 
-    p,li,span,a
+    p,li,span
       font-size: 0.9em
       line-height: 1.4em
       color: #303030
 
+    a
+      font-size: 0.9em
+      line-height: 1.4em
+
     b
       color: #000000
 
     h2
       font-size: 22px
+
     #delete-menu-dialog
       width: 270px
       text-align: center