diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-25 00:09:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-25 00:09:38 +0300 |
commit | 64e74b20597712c8673cf99b766b7b6210ee6c5e (patch) | |
tree | 2676fcdd13d9454e16dc83570e071acf7b616bfb /app | |
parent | 12ce3cc57c9f97bacdbb1ea361df833c7fb4350d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/_page_specific_files.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/milestone.scss (renamed from app/assets/stylesheets/pages/milestone.scss) | 2 | ||||
-rw-r--r-- | app/views/dashboard/milestones/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/groups/milestones/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/groups/milestones/show.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/milestones/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/milestones/show.html.haml | 1 |
7 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index f2ce996904f..3380d93e3d7 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -34,7 +34,6 @@ @import './pages/members'; @import './pages/merge_conflicts'; @import './pages/merge_requests'; -@import './pages/milestone'; @import './pages/monitor'; @import './pages/note_form'; @import './pages/notes'; diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss index e9eb79b071c..c1d7d86e3f9 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/page_bundles/milestone.scss @@ -1,3 +1,5 @@ +@import 'mixins_and_variables_and_functions'; + $status-box-line-height: 26px; .issues-sortable-list .str-truncated { diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml index a0c1c314a85..ff991ccea71 100644 --- a/app/views/dashboard/milestones/index.html.haml +++ b/app/views/dashboard/milestones/index.html.haml @@ -1,6 +1,7 @@ - @hide_top_links = true - page_title _('Milestones') - header_title _('Milestones'), dashboard_milestones_path += stylesheet_link_tag 'page_bundles/milestone' .page-title-holder.d-flex.align-items-center %h1.page-title= _('Milestones') diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml index 1685707d457..83796444b6c 100644 --- a/app/views/groups/milestones/index.html.haml +++ b/app/views/groups/milestones/index.html.haml @@ -1,4 +1,5 @@ - page_title _("Milestones") += stylesheet_link_tag 'page_bundles/milestone' .top-area = render 'shared/milestones_filter', counts: @milestone_states diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 33e68bc766e..fdcce864c24 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -1,3 +1,4 @@ += stylesheet_link_tag 'page_bundles/milestone' = render "header_title" = render 'shared/milestones/top', milestone: @milestone, group: @group = render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 2bab2a0fb03..31303e2b9f8 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -1,4 +1,5 @@ - page_title _('Milestones') += stylesheet_link_tag 'page_bundles/milestone' .top-area = render 'shared/milestones_filter', counts: milestone_counts(@project.milestones) diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 99e626161c4..f575d8178ac 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -2,6 +2,7 @@ - breadcrumb_title @milestone.title - page_title @milestone.title, _('Milestones') - page_description @milestone.description += stylesheet_link_tag 'page_bundles/milestone' = render 'shared/milestones/header', milestone: @milestone = render 'shared/milestones/description', milestone: @milestone |