diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 01:55:40 +0300 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 01:55:40 +0300 |
commit | 53bf57f3acf00436ee16f93cda433670c08a2275 (patch) | |
tree | f82ec99cbba90fb1d85767bbee8b423dfb40be5c /app/views/projects/services | |
parent | 7d00cc9c409bf9c04d7a2f6f1b69bcf6efa9c10c (diff) |
[skip ci] input-group-btn's input-group-text should not create a new div
Diffstat (limited to 'app/views/projects/services')
-rw-r--r-- | app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml | 21 | ||||
-rw-r--r-- | app/views/projects/services/slack_slash_commands/_help.html.haml | 15 |
2 files changed, 12 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 aab9e12577e..209b9c71390 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 @@ -22,16 +22,14 @@ .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 - .input-group-text - = clipboard_button(target: '#display_name') + = clipboard_button(target: '#display_name', class: 'input-group-text') .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-append - .input-group-text - = clipboard_button(target: '#description') + = 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' @@ -48,8 +46,7 @@ .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 - .input-group-text - = clipboard_button(target: '#request_url') + = 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' @@ -60,16 +57,14 @@ .col-sm-10.col-12.input-group = text_field_tag :response_username, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-append - .input-group-text - = clipboard_button(target: '#response_username') + = 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' .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 - .input-group-text - = clipboard_button(target: '#response_icon') + = clipboard_button(target: '#response_icon', class: 'input-group-text') .form-group = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-12 col-form-label' @@ -80,16 +75,14 @@ .col-sm-10.col-12.input-group = text_field_tag :autocomplete_hint, '[help]', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-append - .input-group-text - = clipboard_button(target: '#autocomplete_hint') + = 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' .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 - .input-group-text - = clipboard_button(target: '#autocomplete_description') + = clipboard_button(target: '#autocomplete_description', class: 'input-group-text') %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 72ae69bd10d..0e0c1d11cd4 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -40,8 +40,7 @@ .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 - .input-group-text - = clipboard_button(target: '#url') + = clipboard_button(target: '#url', class: 'input-group-text') .form-group = label_tag nil, 'Method', class: 'col-sm-2 col-12 col-form-label' @@ -52,8 +51,7 @@ .col-sm-10.col-12.input-group = text_field_tag :customize_name, 'GitLab', class: 'form-control form-control-sm', readonly: 'readonly' .input-group-append - .input-group-text - = clipboard_button(target: '#customize_name') + = 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' @@ -70,24 +68,21 @@ .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 - .input-group-text - = clipboard_button(target: '#autocomplete_description') + = 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' .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 - .input-group-text - = clipboard_button(target: '#autocomplete_usage_hint') + = 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' .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 - .input-group-text - = clipboard_button(target: '#descriptive_label') + = clipboard_button(target: '#descriptive_label', class: 'input-group-text') %hr |