Commit b0961026 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch 'convert-status-scss-to-bundle' into 'master'

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

See merge request gitlab-org/gitlab!45584
parents c57079bc 72f46277
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
@import './pages/settings'; @import './pages/settings';
@import './pages/settings_ci_cd'; @import './pages/settings_ci_cd';
@import './pages/sherlock'; @import './pages/sherlock';
@import './pages/status';
@import './pages/storage_quota'; @import './pages/storage_quota';
@import './pages/tree'; @import './pages/tree';
@import './pages/trials'; @import './pages/trials';
......
@import 'mixins_and_variables_and_functions';
.ci-status { .ci-status {
padding: 2px 7px 4px; padding: 2px 7px 4px;
border: 1px solid $gray-darker; border: 1px solid $gray-darker;
......
- page_title _("Jobs") - page_title _("Jobs")
- add_page_specific_style 'page_bundles/ci_status'
.top-area .top-area
- build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) } - build_path_proc = ->(scope) { project_jobs_path(@project, scope: scope) }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- breadcrumb_title "##{@build.id}" - breadcrumb_title "##{@build.id}"
- page_title "#{@build.name} (##{@build.id})", _("Jobs") - page_title "#{@build.name} (##{@build.id})", _("Jobs")
- add_page_specific_style 'page_bundles/xterm' - add_page_specific_style 'page_bundles/xterm'
- add_page_specific_style 'page_bundles/ci_status'
= render_if_exists "shared/shared_runners_minutes_limit_flash_message" = render_if_exists "shared/shared_runners_minutes_limit_flash_message"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- breadcrumb_title _("New") - breadcrumb_title _("New")
- page_title _("New Merge Request") - page_title _("New Merge Request")
- add_page_specific_style 'page_bundles/pipelines' - add_page_specific_style 'page_bundles/pipelines'
- add_page_specific_style 'page_bundles/ci_status'
- if @merge_request.can_be_created && !params[:change_branches] - if @merge_request.can_be_created && !params[:change_branches]
= render 'new_submit' = render 'new_submit'
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
- add_page_specific_style 'page_bundles/merge_requests' - add_page_specific_style 'page_bundles/merge_requests'
- add_page_specific_style 'page_bundles/pipelines' - add_page_specific_style 'page_bundles/pipelines'
- add_page_specific_style 'page_bundles/reports' - add_page_specific_style 'page_bundles/reports'
- add_page_specific_style 'page_bundles/ci_status'
.merge-request{ data: { mr_action: mr_action, url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version } } .merge-request{ data: { mr_action: mr_action, url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version } }
= render "projects/merge_requests/mr_title" = render "projects/merge_requests/mr_title"
......
- page_title _('Pipelines') - page_title _('Pipelines')
- add_page_specific_style 'page_bundles/pipelines' - add_page_specific_style 'page_bundles/pipelines'
- add_page_specific_style 'page_bundles/ci_status'
= render_if_exists "shared/shared_runners_minutes_limit_flash_message" = render_if_exists "shared/shared_runners_minutes_limit_flash_message"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
- pipeline_has_errors = @pipeline.builds.empty? && @pipeline.yaml_errors.present? - pipeline_has_errors = @pipeline.builds.empty? && @pipeline.yaml_errors.present?
- add_page_specific_style 'page_bundles/pipeline' - add_page_specific_style 'page_bundles/pipeline'
- add_page_specific_style 'page_bundles/reports' - add_page_specific_style 'page_bundles/reports'
- add_page_specific_style 'page_bundles/ci_status'
.js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } }
#js-pipeline-header-vue.pipeline-header-container{ data: {full_path: @project.full_path, retry_path: retry_project_pipeline_path(@pipeline.project, @pipeline), cancel_path: cancel_project_pipeline_path(@pipeline.project, @pipeline), delete_path: project_pipeline_path(@pipeline.project, @pipeline), pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id} } #js-pipeline-header-vue.pipeline-header-container{ data: {full_path: @project.full_path, retry_path: retry_project_pipeline_path(@pipeline.project, @pipeline), cancel_path: cancel_project_pipeline_path(@pipeline.project, @pipeline), delete_path: project_pipeline_path(@pipeline.project, @pipeline), pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id} }
......
...@@ -175,6 +175,7 @@ module Gitlab ...@@ -175,6 +175,7 @@ module Gitlab
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/boards.css" config.assets.precompile << "page_bundles/boards.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"
config.assets.precompile << "page_bundles/dev_ops_report.css" config.assets.precompile << "page_bundles/dev_ops_report.css"
config.assets.precompile << "page_bundles/environments.css" config.assets.precompile << "page_bundles/environments.css"
......
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