Merge branch 'wiki-header-spacing' into 'master'

Standardize wiki header spacing

See merge request gitlab-org/gitlab!49777

app/assets/stylesheets/page_bundles/wiki.scss

@@ -15,11 +15,6 @@
     padding: 11px 0;
   }
 
-  .wiki-page-title {
-    margin: 0;
-    font-size: 22px;
-  }
-
   .wiki-last-edit-by {
     display: block;
     color: var(--gray-500, $gray-500);

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

@@ -5,12 +5,11 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      = link_to_wiki_page @page
-      %span.light
-        ·
-        = _('Changes')
+  %h3.page-title.gl-flex-fill-1
+    = link_to_wiki_page @page
+    %span.light
+      ·
+      = _('Changes')
 
   .nav-controls.pb-md-3.pb-lg-0
     = link_to wiki_page_path(@wiki, @page, action: :history), class: 'btn gl-button', role: 'button', data: { qa_selector: 'page_history_button' } do

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

@@ -6,15 +6,14 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      - if @page.persisted?
-        = link_to_wiki_page @page
-        %span.light
-          ·
-          = s_("Wiki|Edit Page")
-      - else
-        = s_("Wiki|Create New Page")
+  %h3.page-title.gl-flex-fill-1
+    - if @page.persisted?
+      = link_to_wiki_page @page
+      %span.light
+        ·
+        = s_("Wiki|Edit Page")
+    - else
+      = s_("Wiki|Create New Page")
 
   .nav-controls.pb-md-3.pb-lg-0
     - if @page.persisted?

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

@@ -4,12 +4,11 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      = link_to_wiki_page @page
-      %span.light
-        ·
-        = _('History')
+  %h3.page-title
+    = link_to_wiki_page @page
+    %span.light
+      ·
+      = _('History')
 
 .prepend-top-default.gl-mb-3
   .table-holder

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

@@ -6,9 +6,9 @@
 
 .wiki-page-header.top-area.flex-column.flex-lg-row
 
-  .nav-text.flex-fill
-    %h2.wiki-page-title
-      = s_("Wiki|Wiki Pages")
+
+  %h3.page-title.gl-flex-fill-1
+    = s_("Wiki|Wiki Pages")
 
   .nav-controls.pb-md-3.pb-lg-0
     = link_to wiki_path(@wiki, action: :git_access), class: 'btn gl-button' do

changelogs/unreleased/wiki-header-spacing.yml

+---
+title: Standardize page title styles on all wiki pages
+merge_request: 49777
+author:
+type: changed

spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb

@@ -79,7 +79,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
       expect(current_path).to eq(wiki_page_path(wiki, "test"))
 
-      page.within(:css, ".nav-text") do
+      page.within(:css, ".wiki-page-header") do
         expect(page).to have_content("Create New Page")
       end
 
@@ -91,7 +91,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
       expect(current_path).to eq(wiki_page_path(wiki, "api"))
 
-      page.within(:css, ".nav-text") do
+      page.within(:css, ".wiki-page-header") do
         expect(page).to have_content("Create")
       end
 
@@ -103,7 +103,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
       expect(current_path).to eq(wiki_page_path(wiki, "raketasks"))
 
-      page.within(:css, ".nav-text") do
+      page.within(:css, ".wiki-page-header") do
         expect(page).to have_content("Create")
       end
     end

spec/support/shared_examples/features/wiki/user_uses_wiki_shortcuts_shared_examples.rb

@@ -15,6 +15,6 @@ RSpec.shared_examples 'User uses wiki shortcuts' do
   it 'visit edit wiki page using "e" keyboard shortcut', :js do
     find('body').native.send_key('e')
 
-    expect(find('.wiki-page-title')).to have_content('Edit Page')
+    expect(find('.page-title')).to have_content('Edit Page')
   end
 end

spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb

@@ -44,7 +44,7 @@ RSpec.shared_examples 'User views a wiki page' do
 
       expect(current_path).to include('one/two/three-test')
 
-      page.within(:css, '.nav-text') do
+      page.within(:css, '.wiki-page-header') do
         expect(page).to have_content('History')
       end
     end
@@ -69,7 +69,7 @@ RSpec.shared_examples 'User views a wiki page' do
 
       click_on('Page history')
 
-      within('.nav-text') do
+      within('.wiki-page-header') do
         expect(page).to have_content('History')
       end