Merge branch...

Merge branch '282168-convert-ee-app-assets-stylesheets-pages-epics-scss-into-page-specific-bundle' into 'master'

Move epics.scss into page bundle

See merge request gitlab-org/gitlab!47595

config/application.rb

@@ -181,6 +181,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/cycle_analytics.css"
     config.assets.precompile << "page_bundles/dev_ops_report.css"
     config.assets.precompile << "page_bundles/environments.css"
+    config.assets.precompile << "page_bundles/epics.css"
     config.assets.precompile << "page_bundles/error_tracking_details.css"
     config.assets.precompile << "page_bundles/error_tracking_index.css"
     config.assets.precompile << "page_bundles/signup.css"

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

+@import 'page_bundles/mixins_and_variables_and_functions';
+
 @include media-breakpoint-down(sm) {
   .epics-other-filters {
     .epics-sort-btn i {
@@ -18,7 +20,7 @@
 }
 
 .epic-discussion-separator {
-  border-color: $border-color;
+  border-color: var(--gray-100, $gray-100);
 }
 
 .epic-sidebar {
@@ -30,7 +32,7 @@
   }
 
   .help-icon {
-    color: $gl-text-color-secondary;
+    color: var(--gray-500, $gray-500);
   }
 
   .btn-sidebar-action.btn-link {
@@ -43,13 +45,13 @@
   }
 
   .date-warning-icon {
-    color: $orange-500;
+    color: var(--orange-500, $orange-500);
     margin-top: -1px;
   }
 
   .is-option-selected {
     > span {
-      color: $gl-text-color;
+      color: var(--gray-500, $gray-500);
       font-weight: $gl-font-weight-bold;
     }
   }
@@ -60,7 +62,7 @@
     min-height: 600px;
 
     .roadmap-shell {
-      border: 1px solid $white-dark;
+      border: 1px solid var(--white-dark, $white-dark);
       border-top: 0;
     }
 
@@ -83,7 +85,7 @@
 }
 
 .tooltip .tooltip-inner .milestone-date-range {
-  color: $gl-text-color-tertiary;
+  color: var(--gray-400, $gray-400);
 }
 
 .new-epic-form .md-area.gfm-form {
@@ -108,54 +110,3 @@
     min-height: 335px;
   }
 }
-
-.labels-select-wrapper.is-embedded {
-  .labels-select-dropdown-button {
-    @include gl-bg-white;
-    @include gl-font-regular;
-    @include gl-font-base;
-    @include gl-line-height-normal;
-    @include gl-py-3;
-    @include gl-px-4;
-    @include gl-h-auto;
-    @include gl-text-left;
-    @include gl-border-none;
-    @include gl-inset-border-1-gray-200;
-    @include gl-rounded-base;
-    @include gl-white-space-nowrap;
-
-    .gl-button-text {
-      @include gl-text-gray-500;
-      @include gl-display-flex;
-      @include gl-justify-content-space-between;
-      @include gl-w-full;
-    }
-
-    .gl-icon {
-      @include gl-m-0;
-    }
-  }
-
-  .labels-select-dropdown-contents {
-    @include gl-left-0;
-    @include gl-shadow-x0-y2-b4-s0;
-
-    width: 300px !important;
-    min-height: none;
-    max-height: none;
-    margin-bottom: $gl-spacing-scale-6 !important;
-
-    a:not(.btn) {
-      @include gl-reset-color;
-    }
-  }
-
-  .dropdown-title {
-    padding-top: $gl-spacing-scale-2 !important;
-    padding-bottom: $gl-spacing-scale-4 !important;
-  }
-
-  .dropdown-footer .list-unstyled {
-    @include gl-m-0;
-  }
-}

ee/app/assets/stylesheets/pages/issuable_form.scss

+.labels-select-wrapper.is-embedded {
+  .labels-select-dropdown-button {
+    @include gl-bg-white;
+    @include gl-font-regular;
+    @include gl-font-base;
+    @include gl-line-height-normal;
+    @include gl-py-3;
+    @include gl-px-4;
+    @include gl-h-auto;
+    @include gl-text-left;
+    @include gl-border-none;
+    @include gl-inset-border-1-gray-200;
+    @include gl-rounded-base;
+    @include gl-white-space-nowrap;
+
+    .gl-button-text {
+      @include gl-text-gray-500;
+      @include gl-display-flex;
+      @include gl-justify-content-space-between;
+      @include gl-w-full;
+    }
+
+    .gl-icon {
+      @include gl-m-0;
+    }
+  }
+
+  .labels-select-dropdown-contents {
+    @include gl-left-0;
+    @include gl-shadow-x0-y2-b4-s0;
+
+    width: 300px !important;
+    min-height: none;
+    max-height: none;
+    margin-bottom: $gl-spacing-scale-6 !important;
+
+    a:not(.btn) {
+      @include gl-reset-color;
+    }
+  }
+
+  .dropdown-title {
+    padding-top: $gl-spacing-scale-2 !important;
+    padding-bottom: $gl-spacing-scale-4 !important;
+  }
+
+  .dropdown-footer .list-unstyled {
+    @include gl-m-0;
+  }
+}

ee/app/views/groups/epics/new.html.haml

@@ -2,5 +2,6 @@
 - add_to_breadcrumbs _("Epics"), group_epics_path(@group)
 - breadcrumb_title _("New")
 - page_title _("New epic")
+- add_page_specific_style 'page_bundles/epics'
 
 .js-epic-new{ data: epic_new_app_data(@group) }

ee/app/views/groups/epics/show.html.haml

@@ -16,6 +16,7 @@
 - page_description     @epic.description_html
 
 - page_card_attributes @epic.card_attributes
+- add_page_specific_style 'page_bundles/epics'
 
 #epic-app-root{ data: epic_show_app_data(@epic),
   'data-allow-sub-epics' => allow_sub_epics }