diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-19 11:43:47 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-19 11:43:47 +0100 |
| commit | 44c82ebbd13a92019297693cc224447653f0ecc2 (patch) | |
| tree | efedf86af7570742ed2ff162dc9504fd04599047 | |
| parent | 8b2a6d41d5359dbfdd5a159f0cce602f36785e1e (diff) | |
| download | gitlab-ce-44c82ebbd13a92019297693cc224447653f0ecc2.tar.gz | |
Added styles for milestone date range in milestone list
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 6 | ||||
| -rw-r--r-- | app/views/shared/_milestone_expired.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 9cbc1a4f302..0c111ae7144 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -239,6 +239,12 @@ } } +.milestone-range { + color: $gl-text-color-tertiary; + margin: $gl-bar-padding 0; + font-size: $tooltip-font-size; +} + @include media-breakpoint-down(xs) { .milestone-banner-text, .milestone-banner-link { diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 814eda5e540..738622a4993 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,5 +1,5 @@ - if milestone.due_date || milestone.start_date - %div + .milestone-range = milestone_date_range(milestone) - if milestone.expired? and not milestone.closed? .status-box.status-box-expired Expired diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 725698226ac..4df87471947 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -29,7 +29,7 @@ - if @project - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - if @project.group - %button.js-promote-project-milestone-button.btn.btn-transparent.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), + %button.js-promote-project-milestone-button.btn.btn-blank.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), disabled: true, type: 'button', data: { url: promote_project_milestone_path(milestone.project, milestone), @@ -38,7 +38,7 @@ target: '#promote-milestone-modal', container: 'body', toggle: 'modal' } } - = sprite_icon('level-up', size: 12) + = sprite_icon('level-up', size: 14) = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" - unless milestone.active? |