Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/admin/topics')
-rw-r--r--app/views/admin/topics/_form.html.haml11
-rw-r--r--app/views/admin/topics/index.html.haml2
2 files changed, 8 insertions, 5 deletions
diff --git a/app/views/admin/topics/_form.html.haml b/app/views/admin/topics/_form.html.haml
index 9b9d97950cc..544310e312c 100644
--- a/app/views/admin/topics/_form.html.haml
+++ b/app/views/admin/topics/_form.html.haml
@@ -38,10 +38,13 @@
- if @topic.new_record?
.form-actions
- = f.submit _('Create topic'), class: "gl-button btn btn-confirm"
- = link_to _('Cancel'), admin_topics_path, class: "gl-button btn btn-default btn-cancel"
+ = f.submit _('Create topic'), pajamas_button: true
+ = render Pajamas::ButtonComponent.new(href: admin_topics_path) do
+ = _('Cancel')
- else
.form-actions
- = f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'save_changes_button' }
- = link_to _('Cancel'), admin_topics_path, class: "gl-button btn btn-cancel"
+ = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+ = render Pajamas::ButtonComponent.new(href: admin_topics_path) do
+ = _('Cancel')
+
diff --git a/app/views/admin/topics/index.html.haml b/app/views/admin/topics/index.html.haml
index 77823ed7058..2f39f27208e 100644
--- a/app/views/admin/topics/index.html.haml
+++ b/app/views/admin/topics/index.html.haml
@@ -9,7 +9,7 @@
= sprite_icon('search', css_class: 'search-icon')
.gl-flex-grow-1
.js-merge-topics{ data: { path: merge_admin_topics_path } }
- = link_to new_admin_topic_path, class: "gl-button btn btn-confirm gl-w-full gl-md-w-auto" do
+ = render Pajamas::ButtonComponent.new(href: new_admin_topic_path, variant: 'confirm') do
= _('New topic')
%ul.content-list
= render partial: 'topic', collection: @topics