3 files changed, 11 insertions, 10 deletions

diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 9a3a03a7671..29db29235c1 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -2,11 +2,12 @@
   .modal-dialog.modal-lg
     .modal-content
       .modal-header
-        %a.close{ href: "#", "data-dismiss" => "modal" } ×
-        %h4
+        %h4.modal-title
           Keyboard Shortcuts
           %small
             = link_to '(Show all)', '#', class: 'js-more-help-button'
+        %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
+          %span{ "aria-hidden": true } ×
       .modal-body
         .row
           .col-lg-4
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 6391a13dd25..7a66bac09cb 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -36,7 +36,7 @@
     .card
       .card-header
         Quick help
-      %ul.well-list
+      %ul.content-list
         %li= link_to 'See our website for getting help', support_url
         %li
           %button.btn-blank.btn-link.js-trigger-search-bar{ type: 'button' }
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index 94b012d39a3..de8369ed7b9 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -116,9 +116,9 @@
 
   .lead
     List with hover effect
-    %code .well-list
+    %code .hover-list
   .example
-    %ul.well-list
+    %ul.hover-list
       %li
         One item
       %li
@@ -131,7 +131,7 @@
   .example
     .card
       .card-header Your list
-      %ul.well-list
+      %ul.content-list
         %li
           One item
         %li
@@ -472,8 +472,8 @@
       .form-group.row
         .offset-sm-2.col-sm-10
           .form-check
-            %label
-              %input{ :type => "checkbox" }/
+            %input.form-check-input{ :type => "checkbox" }/
+            %label.form-check-label
               Remember me
       .form-group.row
         .offset-sm-2.col-sm-10
@@ -492,8 +492,8 @@
         %label{ :for => "exampleInputPassword1" } Password
         %input#exampleInputPassword1.form-control{ :placeholder => "Password", :type => "password" }/
       .form-check
-        %label
-          %input{ :type => "checkbox" }/
+        %input.form-check-input{ :type => "checkbox" }/
+        %label.form-check-label
           Remember me
       %button.btn.btn-default{ :type => "submit" } Sign in