Remove unnecessary text-block styling

3 files changed, 27 insertions, 44 deletions

diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index c05394962d8..533419f657b 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -86,25 +86,8 @@ label {
     border: 1px solid $border-color;
   }
 
-  .text-block {
-    line-height: 0.8;
-    padding-top: 9px;
-
-    code {
-      line-height: 1.8;
-    }
-
-    img {
-      margin-right: $gl-padding;
-    }
-  }
-
   @include media-breakpoint-down(xs) {
     padding: 0 $gl-padding;
-
-    .text-block {
-      padding-left: 0;
-    }
   }
 }
 
diff --git a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
index 9409418bbcc..f4c3561fc47 100644
--- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
@@ -18,22 +18,22 @@
 
 .help-form
   .form-group
-    = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :display_name, "GitLab / #{@project.full_name}", class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#display_name', class: 'input-group-text')
 
   .form-group
-    = label_tag :description, 'Description', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :description, 'Description', class: 'col-sm-2 col-12 col-form-label  label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#description', class: 'input-group-text')
 
   .form-group
-    = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 col-form-label'
-    .col-sm-10.col-12.text-block
+    = label_tag nil, 'Command trigger word', class: 'col-sm-4 col-12 col-form-label label-bold'
+    .col-sm-10.col-12
       %p Fill in the word that works best for your team.
       %p
         Suggestions:
@@ -42,43 +42,43 @@
         %code= @project.full_path
 
   .form-group
-    = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :request_url, service_trigger_url(subject), class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#request_url', class: 'input-group-text')
 
   .form-group
-    = label_tag nil, 'Request method', class: 'col-sm-2 col-12 col-form-label'
-    .col-sm-10.col-12.text-block POST
+    = label_tag nil, 'Request method', class: 'col-sm-2 col-12 col-form-label label-bold'
+    .col-sm-10.col-12 POST
 
   .form-group
-    = label_tag :response_username, 'Response username', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :response_username, 'Response username', class: 'col-sm-4 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :response_username, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#response_username', class: 'input-group-text')
 
   .form-group
-    = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :response_icon, asset_url('gitlab_logo.png'), class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#response_icon', class: 'input-group-text')
 
   .form-group
-    = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label'
-    .col-sm-10.col-12.text-block Yes
+    = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label label-bold'
+    .col-sm-10.col-12 Yes
 
   .form-group
-    = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-4 col-12 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :autocomplete_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#autocomplete_hint', class: 'input-group-text')
 
   .form-group
-    = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label'
+    = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-4 col-12 col-form-label label-bold'
     .col-sm-10.col-12.input-group
       = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml
index 9a7004f89c0..16accdd295e 100644
--- a/app/views/projects/services/slack_slash_commands/_help.html.haml
+++ b/app/views/projects/services/slack_slash_commands/_help.html.haml
@@ -27,8 +27,8 @@
 
       .help-form
         .form-group
-          = label_tag nil, 'Command', class: 'col-sm-2 col-12 col-form-label'
-          .col-sm-10.col-12.text-block
+          = label_tag nil, 'Command', class: 'col-sm-2 col-12 col-form-label label-bold'
+          .col-sm-10.col-12
             %p Fill in the word that works best for your team.
             %p
               Suggestions:
@@ -37,49 +37,49 @@
               %code= @project.full_path
 
         .form-group
-          = label_tag :url, 'URL', class: 'col-sm-2 col-12 col-form-label'
+          = label_tag :url, 'URL', class: 'col-sm-2 col-12 col-form-label label-bold'
           .col-sm-10.col-12.input-group
             = text_field_tag :url, service_trigger_url(subject), class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
               = clipboard_button(target: '#url', class: 'input-group-text')
 
         .form-group
-          = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label'
-          .col-sm-10.col-12.text-block POST
+          = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label label-bold'
+          .col-sm-10.col-12 POST
 
         .form-group
-          = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 col-form-label'
+          = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 col-form-label label-bold'
           .col-sm-10.col-12.input-group
             = text_field_tag :customize_name, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
               = clipboard_button(target: '#customize_name', class: 'input-group-text')
 
         .form-group
-          = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 col-form-label'
-          .col-sm-10.col-12.text-block
-            = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36)
+          = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 col-form-label label-bold'
+          .col-sm-10.col-12
+            = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36, class: 'mr-3')
             = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank', rel: 'noopener noreferrer')
 
         .form-group
-          = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label'
-          .col-sm-10.col-12.text-block Show this command in the autocomplete list
+          = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label label-bold'
+          .col-sm-10.col-12 Show this command in the autocomplete list
 
         .form-group
-          = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label'
+          = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-4 col-form-label label-bold'
           .col-sm-10.col-12.input-group
             = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
               = clipboard_button(target: '#autocomplete_description', class: 'input-group-text')
 
         .form-group
-          = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-12 col-form-label'
+          = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-4 col-form-label label-bold'
           .col-sm-10.col-12.input-group
             = text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append
               = clipboard_button(target: '#autocomplete_usage_hint', class: 'input-group-text')
 
         .form-group
-          = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-12 col-form-label'
+          = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-4 col-form-label label-bold'
           .col-sm-10.col-12.input-group
             = text_field_tag :descriptive_label, 'Perform common operations on GitLab project', class: 'form-control form-control-sm', readonly: 'readonly'
             .input-group-append