Commit 771feddc authored by Scott Hampton's avatar Scott Hampton

Merge branch 'codiini-master-patch-42760' into 'master'

Update button styles in ee/app/views/groups/ directory

See merge request gitlab-org/gitlab!47096
parents bc2c1b48 f9050fb4
......@@ -5,7 +5,7 @@
.settings-header
%h4
= s_('GroupSettings|Custom project templates')
%button.btn.js-settings-toggle{ type: 'button' }
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= s_('GroupSettings|Select a sub-group as the custom project template source for this group.')
......@@ -21,4 +21,4 @@
= _('Custom project templates')
= groups_select_tag('group[custom_project_templates_group_id]', data: { parent_id: @group.id }, selected: @group.custom_project_templates_group_id, class: 'input-clamp allowClear qa-custom-project-template-select', multiple: false)
= f.submit _('Save changes'), class: 'btn btn-success qa-save-changes-button'
= f.submit _('Save changes'), class: 'btn gl-button btn-success qa-save-changes-button'
......@@ -4,7 +4,7 @@
.settings-header
%h4
= _('Insights')
%button.btn.js-settings-toggle{ type: 'button' }
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _('Select a project to read Insights configuration file')
......@@ -23,4 +23,4 @@
= link_to sprite_icon('question-o'), help_page_path('user/group/index.md', anchor: 'insights'), target: '_blank'
= project_select_tag('group[insight_attributes][project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true, include_projects_in_subgroups: true }, value: insight.project_id)
= form.submit _('Save changes'), class: "btn btn-success"
= form.submit _('Save changes'), class: "btn gl-button btn-success"
......@@ -4,7 +4,7 @@
.settings-header
%h4
= _('Templates')
%button.btn.js-settings-toggle{ type: 'button' }
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _('Set a template repository for projects in this group')
......@@ -20,4 +20,4 @@
= link_to sprite_icon('question-o'), help_page_path('user/group/index.md', anchor: 'group-file-templates'), target: '_blank'
= project_select_tag('group[file_template_project_id]', class: 'project-item-select hidden-filter-value qa-file-template-repository-dropdown', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true }, value: @group.checked_file_template_project_id)
= f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_changes_button' }
= f.submit _('Save changes'), class: "btn gl-button btn-success", data: { qa_selector: 'save_changes_button' }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment