Merge branch 'epic-3694-page-specific-ee-bundles' into 'master'

Extract cycle analytics page specific CSS

See merge request gitlab-org/gitlab!42474

app/assets/stylesheets/_page_specific_files.scss

@@ -6,7 +6,6 @@
 @import './pages/ci_projects';
 @import './pages/clusters';
 @import './pages/commits';
-@import './pages/cycle_analytics';
 @import './pages/deploy_keys';
 @import './pages/detail_page';
 @import './pages/dev_ops_report';

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

+@import 'mixins_and_variables_and_functions';
+
 #cycle-analytics,
 .cycle-analytics {
   margin: 24px auto 0;
@@ -84,7 +86,7 @@
       }
 
       .text {
-        color: $layout-link-gray;
+        color: var(--gray-500, $gray-500);
         margin: 0;
       }
 
@@ -127,14 +129,14 @@
       line-height: 65px;
 
       &.active {
-        background: $blue-50;
-        border-color: $blue-300;
-        box-shadow: inset 4px 0 0 0 $blue-500;
+        background: var(--blue-50, $blue-50);
+        border-color: var(--blue-300, $blue-300);
+        box-shadow: inset 4px 0 0 0 var(--blue-500, $blue-500);
       }
 
       &:hover:not(.active) {
-        background-color: $gray-lightest;
-        box-shadow: inset 2px 0 0 0 $border-color;
+        background-color: var(--gray-10, $gray-10);
+        box-shadow: inset 2px 0 0 0 var(--border-color, $border-color);
         cursor: pointer;
       }
 
@@ -148,7 +150,7 @@
 
       .stage-empty,
       .not-available {
-        color: $gl-text-color-secondary;
+        color: var(--gray-500, $gray-500);
       }
     }
   }
@@ -172,7 +174,7 @@
     }
 
     .events-info {
-      color: $gl-text-color-secondary;
+      color: var(--gray-500, $gray-500);
     }
   }
 
@@ -191,7 +193,7 @@
     list-style-type: none;
     padding: 0 0 $gl-padding;
     margin: 0 $gl-padding $gl-padding;
-    border-bottom: 1px solid $gray-darker;
+    border-bottom: 1px solid var(--gray-50, $gray-50);
 
     &:last-child {
       border-bottom: 0;
@@ -220,7 +222,7 @@
         display: block;
 
         a {
-          color: $gl-text-color;
+          color: var(--gl-text-color, $gl-text-color);
         }
       }
     }
@@ -232,24 +234,24 @@
 
     .total-time {
       font-size: $cycle-analytics-big-font;
-      color: $gl-text-color;
+      color: var(--gl-text-color, $gl-text-color);
 
       span {
-        color: $gl-text-color;
+        color: var(--gl-text-color, $gl-text-color);
         font-size: $gl-font-size;
       }
     }
 
     .issue-date,
     .build-date {
-      color: $gl-text-color;
+      color: var(--gl-text-color, $gl-text-color);
     }
 
     .mr-link,
     .issue-link,
     .commit-author-link,
     .issue-author-link {
-      color: $gl-text-color;
+      color: var(--gl-text-color, $gl-text-color);
     }
 
     // Custom CSS for components
@@ -287,16 +289,16 @@
       }
 
       .item-build-name {
-        color: $gl-text-color;
+        color: var(--gl-text-color, $gl-text-color);
       }
 
       .pipeline-id {
-        color: $gl-text-color;
+        color: var(--gl-text-color, $gl-text-color);
         padding: 0 3px 0 0;
       }
 
       .ref-name {
-        color: $black;
+        color: var(--gray-900, $gray-900);
         display: inline-block;
         max-width: 180px;
         text-overflow: ellipsis;
@@ -307,14 +309,14 @@
       }
 
       .commit-sha {
-        color: $blue-600;
+        color: var(--blue-600, $blue-600);
         line-height: 1.3;
         vertical-align: top;
         font-weight: $gl-font-weight-normal;
       }
 
       .fa {
-        color: $gl-text-color-secondary;
+        color: var(--gray-500, $gray-500);
         font-size: $code-font-size;
       }
     }
@@ -326,10 +328,10 @@
     width: 75%;
     margin: 0 auto;
     padding-top: 130px;
-    color: $gl-text-color-secondary;
+    color: var(--gray-500, $gray-500);
 
     h4 {
-      color: $gl-text-color;
+      color: var(--gl-text-color, $gl-text-color);
     }
   }
 

app/assets/stylesheets/themes/_dark.scss

@@ -163,6 +163,8 @@ body.gl-dark {
 
   --gl-text-color: #{$gray-900};
   --border-color: #{$border-color};
+
+  --white: #{$white};
 }
 
 $border-white-light: $gray-900;

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

 - page_title _("Value Stream Analytics")
+- content_for :page_specific_javascripts do
+  = stylesheet_link_tag 'page_bundles/cycle_analytics'
 
 #cycle-analytics{ "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } }
   - if @cycle_analytics_no_data

config/application.rb

@@ -185,6 +185,7 @@ module Gitlab
     config.assets.precompile << "mailers/*.css"
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
     config.assets.precompile << "page_bundles/boards.css"
+    config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/ide.css"
     config.assets.precompile << "page_bundles/issues.css"
     config.assets.precompile << "page_bundles/jira_connect.css"
@@ -219,13 +220,6 @@ module Gitlab
     config.assets.paths << "#{config.root}/node_modules/xterm/src/"
     config.assets.precompile << "xterm.css"
 
-    # Add EE assets
-    if Gitlab.ee?
-      %w[images javascripts stylesheets].each do |path|
-        config.assets.paths << "#{config.root}/ee/app/assets/#{path}"
-      end
-    end
-
     # Import path for EE specific SCSS entry point
     # In CE it will import a noop file, in EE a functioning file
     # Order is important, so that the ee file takes precedence:
@@ -345,6 +339,20 @@ module Gitlab
       end
     end
 
+    # Add EE assets. They should take precedence over CE. This means if two files exist, e.g.:
+    #
+    # ee/app/assets/stylesheets/example.scss
+    # app/assets/stylesheets/example.scss
+    #
+    # The ee/ version will be preferred.
+    initializer :prefer_ee_assets, after: :append_assets_path do |app|
+      if Gitlab.ee?
+        %w[images javascripts stylesheets].each do |path|
+          app.config.assets.paths.unshift("#{config.root}/ee/app/assets/#{path}")
+        end
+      end
+    end
+
     config.after_initialize do
       # Devise (see initializers/8_devise.rb) already reloads routes if
       # eager loading is enabled, so don't do this twice since it's

ee/app/assets/stylesheets/pages/cycle_analytics.scss → ee/app/assets/stylesheets/page_bundles/cycle_analytics.scss

+@import '../../../../../app/assets/stylesheets/page_bundles/cycle_analytics';
+
 .gl-daterange-picker {
   .gl-datepicker-input {
     width: 140px;
@@ -32,7 +34,7 @@
 // https://gitlab.com/gitlab-org/gitlab/-/issues/211796
 .sortable-drag {
   border-radius: 0.25rem;
-  background-color: $white;
+  background-color: var(--white, $white);
   box-shadow: 0 0 0.25rem $gl-btn-active-background,
     0 0.25rem 0.75rem $gl-btn-active-background;
 }