diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-27 20:38:03 +0300 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-02-03 01:45:42 +0300 |
| commit | 7ecd30a840fb00f7a3831adba5349cb89ecfb104 (patch) | |
| tree | 7a95fe8c6d8d7e1d0f6dd70cd344405b5a65f722 | |
| parent | 2c31ebff889a0bee1ef6c56ff80a56deebc2d67b (diff) | |
Align Milestone's issue counter.
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 16 |
3 files changed, 20 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 0bc72f30cc3..d1590e42fcb 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -19,7 +19,3 @@ .color-label { padding: 3px 4px; } - -#tab-labels .issues-count { - margin-left: 30px; -} diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index a8235d02418..55d09ca8efe 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -35,3 +35,10 @@ li.milestone { .milestone-stat { margin-right: 10px; } + + +#tab-labels .issues-count { + margin-right: 17px; + float: right; + width: 105px; +} diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index a8bcad3bbd2..a9cf7e96359 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -143,10 +143,20 @@ %small.cgray= user.username .tab-pane#tab-labels + .gray-content-block.middle-block + .pull-right + - if can?(current_user, :create_issue, @project) + = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "New Issue" do + %i.fa.fa-plus + New Issue + - if can?(current_user, :read_issue, @project) + = link_to 'Browse Issues', namespace_project_issues_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped" + + .oneline + All labels in this milestone %ul.bordered-list.manage-labels-list - @labels.each do |label| %li = render_colored_label(label) - .pull-right - %span.issues-count= pluralize label.open_issues_count, 'open issue' - %span.issues-count= pluralize label.closed_issues_count, 'closed issue' + %span.issues-count= pluralize label.open_issues_count, 'open issue' + %span.issues-count= pluralize label.closed_issues_count, 'closed issue' |