diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 23:49:37 +0300 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 23:49:37 +0300 |
commit | aefd75c044a44b525ee64e48f067b918b3c55109 (patch) | |
tree | 74d382834dddde188e7021786174652159ee95c9 /app/views/projects/services | |
parent | c2cbc155741a2c7f0796c2347e679423ba924e15 (diff) |
[skip ci] .input-group-btn into .input-group-prepend, .input-group-append
Diffstat (limited to 'app/views/projects/services')
-rw-r--r-- | app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml | 35 | ||||
-rw-r--r-- | app/views/projects/services/slack_slash_commands/_help.html.haml | 25 |
2 files changed, 36 insertions, 24 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 9884b436e2b..aab9e12577e 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 @@ -21,15 +21,17 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#display_name') .form-group = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#description') .form-group = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-12 col-form-label' @@ -45,8 +47,9 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#request_url') .form-group = label_tag nil, 'Request method', class: 'col-sm-2 col-12 col-form-label' @@ -56,15 +59,17 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#response_username') .form-group = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#response_icon') .form-group = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label' @@ -74,15 +79,17 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#autocomplete_hint') .form-group = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#autocomplete_description') %hr 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 92f6a858ae0..72ae69bd10d 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -39,8 +39,9 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#url') .form-group = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label' @@ -50,8 +51,9 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#customize_name') .form-group = label_tag nil, 'Customize icon', class: 'col-sm-2 col-12 col-form-label' @@ -67,22 +69,25 @@ = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#autocomplete_description') .form-group = 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') + .input-group-append + .input-group-text + = clipboard_button(target: '#autocomplete_usage_hint') .form-group = 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 - = clipboard_button(target: '#descriptive_label') + .input-group-append + .input-group-text + = clipboard_button(target: '#descriptive_label') %hr |