Commit 7aca7eee authored by Simon Knox's avatar Simon Knox

Merge branch 'pipeline-schedules-scss-to-bundle' into 'master'

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

See merge request gitlab-org/gitlab!45822
parents 6ff5b070 2250d09d
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
@import './pages/notes'; @import './pages/notes';
@import './pages/notifications'; @import './pages/notifications';
@import './pages/pages'; @import './pages/pages';
@import './pages/pipeline_schedules';
@import './pages/pipelines'; @import './pages/pipelines';
@import './pages/profile'; @import './pages/profile';
@import './pages/profiles/preferences'; @import './pages/profiles/preferences';
......
@import 'mixins_and_variables_and_functions';
.pipeline-schedule-form { .pipeline-schedule-form {
.gl-field-error { .gl-field-error {
margin: 10px 0 0; margin: 10px 0 0;
...@@ -32,11 +34,11 @@ ...@@ -32,11 +34,11 @@
} }
.next-run-cell { .next-run-cell {
color: $gl-text-color-secondary; color: var(--gray-500, $gray-500);
} }
a { a {
color: $text-color; color: var(--gl-text-color, $gl-text-color);
} }
svg { svg {
...@@ -46,13 +48,13 @@ ...@@ -46,13 +48,13 @@
.pipeline-schedules-user-callout { .pipeline-schedules-user-callout {
.bordered-box.content-block { .bordered-box.content-block {
border: 1px solid $border-color; border: 1px solid var(--border-color, $border-color);
background-color: transparent; background-color: transparent;
padding: 16px; padding: 16px;
} }
#dismiss-callout-btn { #dismiss-callout-btn {
color: $gl-text-color; color: var(--gl-text-color, $gl-text-color);
} }
} }
......
- add_to_breadcrumbs _("Schedules"), pipeline_schedules_path(@project) - add_to_breadcrumbs _("Schedules"), pipeline_schedules_path(@project)
- breadcrumb_title "##{@schedule.id}" - breadcrumb_title "##{@schedule.id}"
- page_title _("Edit"), @schedule.description, _("Pipeline Schedule") - page_title _("Edit"), @schedule.description, _("Pipeline Schedule")
- add_page_specific_style 'page_bundles/pipeline_schedules'
%h3.page-title %h3.page-title
= _("Edit Pipeline Schedule %{id}") % { id: @schedule.id } = _("Edit Pipeline Schedule %{id}") % { id: @schedule.id }
......
- breadcrumb_title _("Schedules") - breadcrumb_title _("Schedules")
- page_title _("Pipeline Schedules") - page_title _("Pipeline Schedules")
- add_page_specific_style 'page_bundles/pipeline_schedules'
#pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), image_url: image_path('illustrations/pipeline_schedule_callout.svg') } } #pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), image_url: image_path('illustrations/pipeline_schedule_callout.svg') } }
.top-area .top-area
......
- breadcrumb_title "Schedules" - breadcrumb_title "Schedules"
- @breadcrumb_link = namespace_project_pipeline_schedules_path(@project.namespace, @project) - @breadcrumb_link = namespace_project_pipeline_schedules_path(@project.namespace, @project)
- page_title _("New Pipeline Schedule") - page_title _("New Pipeline Schedule")
- add_page_specific_style 'page_bundles/pipeline_schedules'
- add_to_breadcrumbs("Pipelines", project_pipelines_path(@project)) - add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
......
...@@ -174,6 +174,7 @@ module Gitlab ...@@ -174,6 +174,7 @@ module Gitlab
config.assets.precompile << "notify.css" config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css" config.assets.precompile << "mailers/*.css"
config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css" config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
config.assets.precompile << "page_bundles/alert_management_details.css"
config.assets.precompile << "page_bundles/boards.css" config.assets.precompile << "page_bundles/boards.css"
config.assets.precompile << "page_bundles/ci_status.css" config.assets.precompile << "page_bundles/ci_status.css"
config.assets.precompile << "page_bundles/cycle_analytics.css" config.assets.precompile << "page_bundles/cycle_analytics.css"
...@@ -191,13 +192,13 @@ module Gitlab ...@@ -191,13 +192,13 @@ module Gitlab
config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/milestone.css"
config.assets.precompile << "page_bundles/pipeline.css" config.assets.precompile << "page_bundles/pipeline.css"
config.assets.precompile << "page_bundles/pipelines.css" config.assets.precompile << "page_bundles/pipelines.css"
config.assets.precompile << "page_bundles/pipeline_schedules.css"
config.assets.precompile << "page_bundles/productivity_analytics.css" config.assets.precompile << "page_bundles/productivity_analytics.css"
config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/terminal.css"
config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/todos.css"
config.assets.precompile << "page_bundles/reports.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 << "page_bundles/wiki.css"
config.assets.precompile << "page_bundles/alert_management_details.css" config.assets.precompile << "page_bundles/xterm.css"
config.assets.precompile << "lazy_bundles/cropper.css" config.assets.precompile << "lazy_bundles/cropper.css"
config.assets.precompile << "performance_bar.css" config.assets.precompile << "performance_bar.css"
config.assets.precompile << "lib/ace.js" config.assets.precompile << "lib/ace.js"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment