Merge branch '239898-convert-stylesheets-pages-wiki-scss-into-page-specific-bundle' into 'master'

Convert stylesheets/pages/wiki.scss into page specific bundle

See merge request gitlab-org/gitlab!45404

app/assets/stylesheets/_page_specific_files.scss

@@ -44,4 +44,3 @@
 @import './pages/tree';
 @import './pages/trials';
 @import './pages/users';
-@import './pages/wiki';

app/assets/stylesheets/pages/wiki.scss → app/assets/stylesheets/page_bundles/wiki.scss

+@import 'mixins_and_variables_and_functions';
+
 .title .edit-wiki-header {
   width: 780px;
   margin-left: auto;
@@ -9,7 +11,7 @@
   position: relative;
 
   .wiki-breadcrumb {
-    border-bottom: 1px solid $white-normal;
+    border-bottom: 1px solid var(--gray-50, $gray-50);
     padding: 11px 0;
   }
 
@@ -20,16 +22,16 @@
 
   .wiki-last-edit-by {
     display: block;
-    color: $gl-text-color-secondary;
+    color: var(--gray-500, $gray-500);
 
     strong {
-      color: $gl-text-color;
+      color: var(--gl-text-color, $gl-text-color);
     }
   }
 
   .light {
     font-weight: $gl-font-weight-normal;
-    color: $gl-text-color-secondary;
+    color: var(--gray-500, $gray-500);
   }
 
   .git-clone-holder {
@@ -92,7 +94,7 @@
   }
 
   a {
-    color: $layout-link-gray;
+    color: var(--gray-400, $gray-400);
 
     &:hover,
     &.active {
@@ -105,7 +107,7 @@
   }
 
   .active > a {
-    color: $black;
+    color: var(--black, $black);
   }
 
   ul.wiki-pages,
@@ -134,7 +136,7 @@
 
 ul.wiki-pages-list.content-list {
   a {
-    color: $blue-600;
+    color: var(--blue-600, $blue-600);
   }
 
   ul {

app/assets/stylesheets/themes/_dark.scss

@@ -165,6 +165,7 @@ body.gl-dark {
   --border-color: #{$border-color};
 
   --white: #{$white};
+  --black: #{$black};
 }
 
 $border-white-light: $gray-900;

app/views/projects/confluences/show.html.haml

 - breadcrumb_title _('Confluence')
 - page_title _('Confluence')
+- add_page_specific_style 'page_bundles/wiki'
 = render layout: 'shared/empty_states/wikis_layout', locals: { image_path: 'illustrations/wiki_login_empty.svg' } do
   %h4
     = s_('WikiEmpty|Confluence is enabled')

app/views/projects/wikis/git_access.html.haml

 - @content_class = "limit-container-width" unless fluid_layout
 - page_title s_("WikiClone|Git Access"), _("Wiki")
+- add_page_specific_style 'page_bundles/wiki'
 
 .wiki-page-header.top-area.has-sidebar-toggle.py-3.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button

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

 - wiki_page_title @page, _('Changes')
+- add_page_specific_style 'page_bundles/wiki'
 - commit = @diffs.diffable
 
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row

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

 - wiki_page_title @page, @page.persisted? ? _('Edit') : _('New')
+- add_page_specific_style 'page_bundles/wiki'
 
 = wiki_page_errors(@error)
 

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

 - page_title _("Wiki")
 - @right_sidebar = false
+- add_page_specific_style 'page_bundles/wiki'
 
 = render 'shared/empty_states/wikis'

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

 - wiki_page_title @page, _('History')
+- add_page_specific_style 'page_bundles/wiki'
 
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button

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

@@ -2,6 +2,7 @@
 - breadcrumb_title s_("Wiki|Pages")
 - page_title s_("Wiki|Pages"), _("Wiki")
 - sort_title = wiki_sort_title(params[:sort])
+- add_page_specific_style 'page_bundles/wiki'
 
 .wiki-page-header.top-area.flex-column.flex-lg-row
 

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

 - wiki_page_title @page
+- add_page_specific_style 'page_bundles/wiki'
 
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button

config/application.rb

@@ -194,6 +194,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/todos.css"
     config.assets.precompile << "page_bundles/reports.css"
     config.assets.precompile << "page_bundles/xterm.css"
+    config.assets.precompile << "page_bundles/wiki.css"
     config.assets.precompile << "lazy_bundles/cropper.css"
     config.assets.precompile << "performance_bar.css"
     config.assets.precompile << "lib/ace.js"