Merge branch '#231217-shared/wikis' into 'master'

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

See merge request gitlab-org/gitlab!44338

app/views/shared/wikis/_form.html.haml

@@ -72,8 +72,8 @@
     - if @page && @page.persisted?
       = f.submit _("Save changes"), class: 'btn-success btn qa-save-changes-button'
       .float-right
-        = link_to _("Cancel"), wiki_page_path(@wiki, @page), class: 'btn btn-cancel btn-grouped'
+        = link_to _("Cancel"), wiki_page_path(@wiki, @page), class: 'btn gl-button btn-cancel btn-grouped'
     - else
       = f.submit s_("Wiki|Create page"), class: 'btn-success btn qa-create-page-button rspec-create-page-button'
       .float-right
-        = link_to _("Cancel"), wiki_path(@wiki), class: 'btn btn-cancel'
+        = link_to _("Cancel"), wiki_path(@wiki), class: 'btn gl-button btn-cancel'

app/views/shared/wikis/_main_links.html.haml

 - if @page&.persisted?
   - if can?(current_user, :create_wiki, @wiki.container)
-    = link_to wiki_path(@wiki, action: :new), class: "btn btn-success", role: "button", data: { qa_selector: 'new_page_button' } do
+    = link_to wiki_path(@wiki, action: :new), class: "btn gl-button btn-success", role: "button", data: { qa_selector: 'new_page_button' } do
       = s_("Wiki|New page")
-  = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn", role: "button", data: { qa_selector: 'page_history_button' } do
+  = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn gl-button", role: "button", data: { qa_selector: 'page_history_button' } do
     = s_("Wiki|Page history")
   - if can?(current_user, :create_wiki, @wiki.container) && @page.latest? && @valid_encoding
-    = link_to wiki_page_path(@wiki, @page, action: :edit), class: "btn js-wiki-edit", role: "button", data: { qa_selector: 'edit_page_button' } do
+    = link_to wiki_page_path(@wiki, @page, action: :edit), class: "btn gl-button js-wiki-edit", role: "button", data: { qa_selector: 'edit_page_button' } do
       = _("Edit")

app/views/shared/wikis/_sidebar.html.haml

@@ -19,5 +19,5 @@
             = render @sidebar_wiki_entries, context: 'sidebar'
       .block.w-100
         - if @sidebar_limited
-          = link_to wiki_path(@wiki, action: :pages), class: 'btn btn-block', data: { qa_selector: 'view_all_pages_button' } do
+          = link_to wiki_path(@wiki, action: :pages), class: 'btn gl-button btn-block', data: { qa_selector: 'view_all_pages_button' } do
             = s_("Wiki|View All Pages")

app/views/shared/wikis/diff.html.haml

@@ -12,7 +12,7 @@
         = _('Changes')
 
   .nav-controls.pb-md-3.pb-lg-0
-    = link_to wiki_page_path(@wiki, @page, action: :history), class: 'btn', role: 'button', data: { qa_selector: 'page_history_button' } do
+    = link_to wiki_page_path(@wiki, @page, action: :history), class: 'btn gl-button', role: 'button', data: { qa_selector: 'page_history_button' } do
       = s_('Wiki|Page history')
 
 .page-content-header

app/views/shared/wikis/edit.html.haml

@@ -17,7 +17,7 @@
 
   .nav-controls.pb-md-3.pb-lg-0
     - if @page.persisted?
-      = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn" do
+      = link_to wiki_page_path(@wiki, @page, action: :history), class: "btn gl-button" do
         = s_("Wiki|Page history")
       - if can?(current_user, :admin_wiki, @wiki.container)
         #delete-wiki-modal-wrapper{ data: { delete_wiki_url: wiki_page_path(@wiki, @page), page_title: @page.human_title } }

app/views/shared/wikis/pages.html.haml

@@ -10,14 +10,14 @@
       = s_("Wiki|Wiki Pages")
 
   .nav-controls.pb-md-3.pb-lg-0
-    = link_to wiki_path(@wiki, action: :git_access), class: 'btn' do
+    = link_to wiki_path(@wiki, action: :git_access), class: 'btn gl-button' do
       = sprite_icon('download')
       = _("Clone repository")
 
     .dropdown.inline.wiki-sort-dropdown
       .btn-group{ role: 'group' }
         .btn-group{ role: 'group' }
-          %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
+          %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn gl-button btn-default' }
             = sort_title
             = sprite_icon('chevron-down')
           %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort

changelogs/unreleased/-231217-shared-wikis.yml

+---
+title: Apply GitLab UI button styles to buttons in app/views/shared/wikis directory
+merge_request: 44338
+author: Lakshit
+type: other