Commit c64241ee authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '231209-labels-buttons' into 'master'

Apply GitLab UI styles to buttons in app/views/shared/labels directory

Closes #231209

See merge request gitlab-org/gitlab!43346
parents f4290917 39e008d0
......@@ -28,7 +28,7 @@
= render_suggested_colors
.form-actions
- if @label.persisted?
= f.submit 'Save changes', class: 'btn btn-success js-save-button'
= f.submit 'Save changes', class: 'btn gl-button btn-success js-save-button'
- else
= f.submit 'Create label', class: 'btn btn-success js-save-button qa-label-create-button'
= link_to 'Cancel', back_path, class: 'btn btn-cancel'
= f.submit 'Create label', class: 'btn gl-button btn-success js-save-button qa-label-create-button'
= link_to 'Cancel', back_path, class: 'btn gl-button btn-cancel'
......@@ -15,10 +15,10 @@
.input-group
= search_field_tag :search, params[:search], { placeholder: _('Filter'), id: 'label-search', class: 'form-control search-text-input input-short', spellcheck: false, autofocus: true }
%span.input-group-append
%button.btn.btn-default{ type: "submit", "aria-label" => _('Submit search') }
%button.btn.gl-button.btn-default{ type: "submit", "aria-label" => _('Submit search') }
= icon("search")
= render 'shared/labels/sort_dropdown'
- if labels_or_filters && can_admin_label && @project
= link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new"
= link_to _('New label'), new_project_label_path(@project), class: "btn gl-button btn-success qa-label-create-new"
- if labels_or_filters && can_admin_label && @group
= link_to _('New label'), new_group_label_path(@group), class: "btn btn-success qa-label-create-new"
= link_to _('New label'), new_group_label_path(@group), class: "btn gl-button btn-success qa-label-create-new"
---
title: Apply GitLab UI styles to buttons in app/views/shared/labels directory
merge_request: 43346
author: Gary Bell @garybell
type: other
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