Merge branch '239804-move-commit-description-styles' into 'master'

Move commit description styles to a page-specific bundle

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145348



Merged-by: Simon Knox <simon@gitlab.com>
Approved-by: Simon Knox <simon@gitlab.com>
Reviewed-by: Simon Knox <simon@gitlab.com>
Reviewed-by: Paul Gascou-Vaillancourt <pgascouvaillancourt@gitlab.com>
Co-authored-by: Paul Gascou-Vaillancourt <paul.gascvail@gmail.com>

app/assets/stylesheets/page_bundles/commit_description.scss

+@import 'mixins_and_variables_and_functions';
+
+.commit-description,
+.commit-row-description {
+  padding: $gl-padding-8 0 $gl-padding-8 $gl-padding-8;
+  margin-top: $gl-padding-8;
+  border: 0;
+  border-radius: unset;
+  background: none;
+  word-break: normal;
+  overflow-x: auto;
+  border-left: 3px solid var(--border-color, $gray-100);
+  color: var(--gray-700, $gl-text-color-secondary);
+}

app/assets/stylesheets/page_bundles/commits.scss

@@ -2,7 +2,7 @@
 
 .commits-row {
   + .commits-row {
-    border-top: 1px solid $gray-50;
+    border-top: 1px solid var(--gray-50, $gray-50);
   }
 
   + .commits-empty {
@@ -23,7 +23,7 @@
   }
 
   .title-hint-text {
-    color: $gl-text-color-secondary;
+    color: var(--gray-700, $gl-text-color-secondary);
   }
 
   .gl-filtered-search-suggestion-list.dropdown-menu {

app/assets/stylesheets/page_bundles/merge_request.scss

 @import 'mixins_and_variables_and_functions';
+@import 'page_bundles/commits';
+@import 'page_bundles/commit_description';
 
 $tabs-holder-z-index: 250;
 $comparison-empty-state-height: 62px;

app/assets/stylesheets/pages/commits.scss

-.commit-description,
-.commit-row-description {
-  padding: $gl-padding-8 0 $gl-padding-8 $gl-padding-8;
-  margin-top: $gl-padding-8;
-  border: 0;
-  border-radius: unset;
-  background: none;
-  word-break: normal;
-  overflow-x: auto;
-  border-left: 3px solid $gray-100;
-  color: $gl-text-color-secondary;
-}
-
 .commit-box {
   border-top: 1px solid $border-color;
   padding: $gl-padding 0;

app/views/layouts/_head.html.haml

@@ -4,7 +4,7 @@
 
 -# This is a temporary place for the page specific style migrations to be included on all pages like page_specific_files
 - if Feature.disabled?(:page_specific_styles, current_user)
-  - add_page_specific_style('page_bundles/commits')
+  - add_page_specific_style('page_bundles/commit_description')
 
 %head{ omit_og ? { } : { prefix: "og: http://ogp.me/ns#" } }
   %meta{ charset: "utf-8" }

app/views/projects/_files.html.haml

@@ -6,6 +6,7 @@
 - add_page_startup_api_call logs_file_project_ref_path(@project, ref, @path, format: "json", offset: 0, ref_type: @ref_type)
 - if readme_path = @project.repository.readme_path
   - add_page_startup_api_call project_blob_path(@project, tree_join(@ref, readme_path), viewer: "rich", format: "json")
+- add_page_specific_style 'page_bundles/commit_description'
 
 #tree-holder.tree-holder.clearfix.js-per-page.gl-mt-5{ data: { blame_per_page: Gitlab::Git::BlamePagination::PAGINATION_PER_PAGE } }
   - if Feature.enabled?(:project_overview_reorg)

app/views/projects/commit/_commit_box.html.haml

+- add_page_specific_style 'page_bundles/commit_description'
+
 .page-content-header
   .header-main-content
     = render partial: 'signature', object: @commit.signature

app/views/projects/commits/_commit.html.haml

@@ -21,6 +21,7 @@
 - link              = commit_path(project, commit, merge_request: merge_request)
 - show_project_name = local_assigns.fetch(:show_project_name, false)
 - toggle_commit_message = _("Toggle commit description")
+- add_page_specific_style 'page_bundles/commit_description'
 
 %li{ class: ["commit flex-row", ("js-toggle-container" if collapsible)], id: "commit-#{commit.short_id}" }
   .avatar-cell.d-none.d-sm-block

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

 - add_page_specific_style 'page_bundles/merge_request'
-- add_page_specific_style 'page_bundles/commits'
 
 = render 'page'

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

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

config/application.rb

@@ -305,6 +305,7 @@ class Application < Rails::Application
     config.assets.precompile << "page_bundles/cluster_agents.css"
     config.assets.precompile << "page_bundles/clusters.css"
     config.assets.precompile << "page_bundles/commits.css"
+    config.assets.precompile << "page_bundles/commit_description.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/dashboard.css"
     config.assets.precompile << "page_bundles/dashboard_projects.css"