summaryrefslogtreecommitdiff
path: root/app/views/projects/services
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-11 14:36:17 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-11 14:36:17 -0500
commite44ceb96d0875ffbe2959cd17a87f02b2b815547 (patch)
treee464e0454bb72c2cba1d63a7d2ffa3b5e3eeac4b /app/views/projects/services
parent94a051cf5489061460b6ffa70a232e5e7cbb1eba (diff)
downloadgitlab-ce-e44ceb96d0875ffbe2959cd17a87f02b2b815547.tar.gz
[skip ci] .control-label to .col-form-label
Diffstat (limited to 'app/views/projects/services')
-rw-r--r--app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml20
-rw-r--r--app/views/projects/services/slack_slash_commands/_help.html.haml18
2 files changed, 19 insertions, 19 deletions
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 e721d0e2ab9..9884b436e2b 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,21 +18,21 @@
.help-form
.form-group
- = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 control-label'
+ = label_tag :display_name, 'Display name', class: 'col-sm-2 col-12 col-form-label'
.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-btn
= clipboard_button(target: '#display_name')
.form-group
- = label_tag :description, 'Description', class: 'col-sm-2 col-12 control-label'
+ = label_tag :description, 'Description', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.input-group
= text_field_tag :description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(target: '#description')
.form-group
- = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 control-label'
+ = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.text-block
%p Fill in the word that works best for your team.
%p
@@ -42,43 +42,43 @@
%code= @project.full_path
.form-group
- = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 control-label'
+ = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-12 col-form-label'
.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-btn
= clipboard_button(target: '#request_url')
.form-group
- = label_tag nil, 'Request method', class: 'col-sm-2 col-12 control-label'
+ = label_tag nil, 'Request method', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.text-block POST
.form-group
- = label_tag :response_username, 'Response username', class: 'col-sm-2 col-12 control-label'
+ = label_tag :response_username, 'Response username', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.input-group
= text_field_tag :response_username, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(target: '#response_username')
.form-group
- = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 control-label'
+ = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-12 col-form-label'
.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-btn
= clipboard_button(target: '#response_icon')
.form-group
- = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 control-label'
+ = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.text-block Yes
.form-group
- = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-12 control-label'
+ = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.input-group
= text_field_tag :autocomplete_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(target: '#autocomplete_hint')
.form-group
- = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 control-label'
+ = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label'
.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-btn
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 020db36027c..92f6a858ae0 100644
--- a/app/views/projects/services/slack_slash_commands/_help.html.haml
+++ b/app/views/projects/services/slack_slash_commands/_help.html.haml
@@ -26,7 +26,7 @@
.help-form
.form-group
- = label_tag nil, 'Command', class: 'col-sm-2 col-12 control-label'
+ = label_tag nil, 'Command', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.text-block
%p Fill in the word that works best for your team.
%p
@@ -36,49 +36,49 @@
%code= @project.full_path
.form-group
- = label_tag :url, 'URL', class: 'col-sm-2 col-12 control-label'
+ = label_tag :url, 'URL', class: 'col-sm-2 col-12 col-form-label'
.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-btn
= clipboard_button(target: '#url')
.form-group
- = label_tag nil, 'Method', class: 'col-sm-2 col-12 control-label'
+ = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.text-block POST
.form-group
- = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 control-label'
+ = label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.input-group
= text_field_tag :customize_name, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(target: '#customize_name')
.form-group
- = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 control-label'
+ = 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)
= 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 control-label'
+ = 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
.form-group
- = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 control-label'
+ = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-12 col-form-label'
.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-btn
= clipboard_button(target: '#autocomplete_description')
.form-group
- = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-12 control-label'
+ = label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-12 col-form-label'
.col-sm-10.col-12.input-group
= text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly'
.input-group-btn
= clipboard_button(target: '#autocomplete_usage_hint')
.form-group
- = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-12 control-label'
+ = label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-12 col-form-label'
.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-btn