diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-14 11:42:07 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-14 11:42:07 +0300 |
| commit | 14d528f65321d86f212c842e2e3740f28ca3483a (patch) | |
| tree | e82fa510c20e57b465365de5bac7ee513ae3bf6c /app/views | |
| parent | f469a4686880d8bc9c1b46cf30f0dc57b6f2a534 (diff) | |
| parent | d9f6cf98d7593e07a8d15ce082eb6c7cb4ef28ec (diff) | |
Merge branch 'backport-related-issues-board-issue-count-badge-styles' into 'master'
Backport issue count badge style refactor for re-use from EE related issues
See merge request !12152
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/boards/components/_board.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml index 55c4d51be14..539ee087b14 100644 --- a/app/views/projects/boards/components/_board.html.haml +++ b/app/views/projects/boards/components/_board.html.haml @@ -9,11 +9,11 @@ %span.has-tooltip{ ":title" => '(list.label ? list.label.description : "")', data: { container: "body", placement: "bottom" } } {{ list.title }} - .board-issue-count-holder.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' } - %span.board-issue-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' } + .issue-count-badge.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' } + %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' } {{ list.issuesSize }} - if can?(current_user, :admin_issue, @project) - %button.btn.btn-small.btn-default.pull-right.has-tooltip.js-no-trigger-collapse{ type: "button", + %button.issue-count-badge-add-button.btn.btn-small.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button", "@click" => "showNewIssueForm", "v-if" => 'list.type !== "closed"', "aria-label" => "New issue", |