Commit a9dc7769 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch...

Merge branch '239854-convert-stylesheets-pages-milestone-scss-into-page-specific-bundle' into 'master'

Convert milestone.scss into page specific bundle

Closes #239854

See merge request gitlab-org/gitlab!42922
parents d4628f0c ff055a66
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
@import './pages/members'; @import './pages/members';
@import './pages/merge_conflicts'; @import './pages/merge_conflicts';
@import './pages/merge_requests'; @import './pages/merge_requests';
@import './pages/milestone';
@import './pages/monitor'; @import './pages/monitor';
@import './pages/note_form'; @import './pages/note_form';
@import './pages/notes'; @import './pages/notes';
......
@import 'mixins_and_variables_and_functions';
$status-box-line-height: 26px; $status-box-line-height: 26px;
.issues-sortable-list .str-truncated { .issues-sortable-list .str-truncated {
......
- @hide_top_links = true - @hide_top_links = true
- page_title _('Milestones') - page_title _('Milestones')
- header_title _('Milestones'), dashboard_milestones_path - header_title _('Milestones'), dashboard_milestones_path
= stylesheet_link_tag 'page_bundles/milestone'
.page-title-holder.d-flex.align-items-center .page-title-holder.d-flex.align-items-center
%h1.page-title= _('Milestones') %h1.page-title= _('Milestones')
......
- page_title _("Milestones") - page_title _("Milestones")
= stylesheet_link_tag 'page_bundles/milestone'
.top-area .top-area
= render 'shared/milestones_filter', counts: @milestone_states = render 'shared/milestones_filter', counts: @milestone_states
......
= stylesheet_link_tag 'page_bundles/milestone'
= render "header_title" = render "header_title"
= render 'shared/milestones/top', milestone: @milestone, group: @group = render 'shared/milestones/top', milestone: @milestone, group: @group
= render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true = render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true
......
- page_title _('Milestones') - page_title _('Milestones')
= stylesheet_link_tag 'page_bundles/milestone'
.top-area .top-area
= render 'shared/milestones_filter', counts: milestone_counts(@project.milestones) = render 'shared/milestones_filter', counts: milestone_counts(@project.milestones)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- breadcrumb_title @milestone.title - breadcrumb_title @milestone.title
- page_title @milestone.title, _('Milestones') - page_title @milestone.title, _('Milestones')
- page_description @milestone.description - page_description @milestone.description
= stylesheet_link_tag 'page_bundles/milestone'
= render 'shared/milestones/header', milestone: @milestone = render 'shared/milestones/header', milestone: @milestone
= render 'shared/milestones/description', milestone: @milestone = render 'shared/milestones/description', milestone: @milestone
......
...@@ -188,6 +188,7 @@ module Gitlab ...@@ -188,6 +188,7 @@ module Gitlab
config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "page_bundles/ide.css"
config.assets.precompile << "page_bundles/issues.css" config.assets.precompile << "page_bundles/issues.css"
config.assets.precompile << "page_bundles/jira_connect.css" config.assets.precompile << "page_bundles/jira_connect.css"
config.assets.precompile << "page_bundles/milestone.css"
config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/todos.css"
config.assets.precompile << "page_bundles/xterm.css" config.assets.precompile << "page_bundles/xterm.css"
config.assets.precompile << "performance_bar.css" config.assets.precompile << "performance_bar.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