From 21fceccf2f0209dcbac79da7decc4bdabe3a4e2b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <andy@pixelde.su>
Date: Sun, 19 Apr 2020 23:26:29 +0200
Subject: [PATCH] Adjust modal layouts to Bootstrap 4

---
 app/views/shared/_comment_smiles.html.haml        | 2 +-
 app/views/shared/_modal_ask_followers.html.haml   | 2 +-
 app/views/user/_account.html.haml                 | 2 +-
 app/views/user/_modal_ban.html.haml               | 4 ++--
 app/views/user/_modal_group_memberships.html.haml | 2 +-
 app/views/user/_modal_privileges.html.haml        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/shared/_comment_smiles.html.haml b/app/views/shared/_comment_smiles.html.haml
index f3b8aebb..8eeb73c1 100644
--- a/app/views/shared/_comment_smiles.html.haml
+++ b/app/views/shared/_comment_smiles.html.haml
@@ -2,10 +2,10 @@
   .modal-dialog
     .modal-content
       .modal-header
+        %h5#modal-ask-followers-label.modal-title= t 'views.answerbox.commentsmile'
         %button.close{"data-dismiss" => "modal", :type => "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only Close
-        %h4#modal-ask-followers-label.modal-title= t 'views.answerbox.commentsmile'
       .modal-body
         - if comment.smiles.all.count == 0
           = t 'views.answerbox.no_smile'
diff --git a/app/views/shared/_modal_ask_followers.html.haml b/app/views/shared/_modal_ask_followers.html.haml
index c7d14b21..43d295d5 100644
--- a/app/views/shared/_modal_ask_followers.html.haml
+++ b/app/views/shared/_modal_ask_followers.html.haml
@@ -2,10 +2,10 @@
   .modal-dialog
     .modal-content
       .modal-header
+        %h5#modal-ask-followers-label.modal-title= t 'views.modal.ask.title'
         %button.close{"data-dismiss" => "modal", :type => "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only= t 'views.actions.close'
-        %h4#modal-ask-followers-label.modal-title= t 'views.modal.ask.title'
       .modal-body
         %textarea.form-control{:name => "qb-all-question", :placeholder => t('views.placeholder.question')}
       .modal-footer
diff --git a/app/views/user/_account.html.haml b/app/views/user/_account.html.haml
index f59e7a0c..ad597d53 100644
--- a/app/views/user/_account.html.haml
+++ b/app/views/user/_account.html.haml
@@ -12,10 +12,10 @@
               .modal-dialog
                 .modal-content
                   .modal-header
+                    %h5#modal-passwd-label.modal-title= t 'views.settings.account.modal.title'
                     %button.close{"data-dismiss" => "modal", :type => "button"}
                       %span{"aria-hidden" => "true"} ×
                       %span.sr-only= t 'views.actions.close'
-                    %h4#modal-passwd-label.modal-title= t 'views.settings.account.modal.title'
                   .modal-body
                     = f.password_field :current_password, autocomplete: "off", label: t('views.settings.account.password_current'), help: t('views.settings.account.password_current_help')
                   .modal-footer
diff --git a/app/views/user/_modal_ban.html.haml b/app/views/user/_modal_ban.html.haml
index 63b374bd..0e1d5752 100644
--- a/app/views/user/_modal_ban.html.haml
+++ b/app/views/user/_modal_ban.html.haml
@@ -2,11 +2,11 @@
   .modal-dialog
     .modal-content
       .modal-header
+        %h5#modal-ban-label.modal-title
+          = t 'views.modal.bancontrol.title'
         %button.close{"data-dismiss" => "modal", :type => "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only Close
-        %h4#modal-ban-label.modal-title
-          = t 'views.modal.bancontrol.title'
       = bootstrap_form_tag(url: '/mod/ban', html: { method: :post, novalidate: "novalidate" }) do |f|
         = f.hidden_field :user, value: @user.screen_name
         #ban-control-super.modal-body
diff --git a/app/views/user/_modal_group_memberships.html.haml b/app/views/user/_modal_group_memberships.html.haml
index b8b1265a..e9b144be 100644
--- a/app/views/user/_modal_group_memberships.html.haml
+++ b/app/views/user/_modal_group_memberships.html.haml
@@ -2,10 +2,10 @@
   .modal-dialog
     .modal-content
       .modal-header
+        %h5#modal-group-memberships-label.modal-title= t 'views.modal.group.title'
         %button.close{"data-dismiss" => "modal", :type => "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only= t 'views.actions.close'
-        %h4#modal-group-memberships-label.modal-title= t 'views.modal.group.title'
       %div{role: "tabpanel"}
         %ul.nav.nav-tabs{role: "tablist"}
           %li.active{role: "presentation"}
diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
index 351e030c..8bcfd008 100644
--- a/app/views/user/_modal_privileges.html.haml
+++ b/app/views/user/_modal_privileges.html.haml
@@ -2,11 +2,11 @@
   .modal-dialog
     .modal-content
       .modal-header
+        %h5#modal-privileges-label.modal-title
+          = raw t('views.actions.privilege', user: @user.screen_name)
         %button.close{"data-dismiss" => "modal", :type => "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only= t 'views.actions.close'
-        %h4#modal-privileges-label.modal-title
-          = raw t('views.actions.privilege', user: @user.screen_name)
       %ul.list-group.groups--list
         = render 'user/modal_privileges_item', privilege: 'blogger', description: t('views.modal.privilege.blogger'), user: @user
         = render 'user/modal_privileges_item', privilege: 'contributor', description: t('views.modal.privilege.contributor'), user: @user