Commit 27b7aeddfbd4b927c45d574c2c1cc846abe0cca2
1 parent
512cd023
Exists in
master
and in
4 other branches
More compact lists for dashboard issues, mr
Showing
3 changed files
with
19 additions
and
6 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
| @@ -15,6 +15,22 @@ | @@ -15,6 +15,22 @@ | ||
| 15 | border: 1px solid #CCC; | 15 | border: 1px solid #CCC; |
| 16 | word-wrap: break-word; | 16 | word-wrap: break-word; |
| 17 | 17 | ||
| 18 | + &.small-box { | ||
| 19 | + margin-bottom: 10px; | ||
| 20 | + | ||
| 21 | + .title { | ||
| 22 | + font-size: 13px; | ||
| 23 | + line-height: 30px; | ||
| 24 | + | ||
| 25 | + a { | ||
| 26 | + color: #666; | ||
| 27 | + &:hover { | ||
| 28 | + text-decoration: underline; | ||
| 29 | + } | ||
| 30 | + } | ||
| 31 | + } | ||
| 32 | + } | ||
| 33 | + | ||
| 18 | &.ui-box-show { | 34 | &.ui-box-show { |
| 19 | margin:20px 0; | 35 | margin:20px 0; |
| 20 | background: #FFF; | 36 | background: #FFF; |
app/views/shared/_issues.html.haml
| 1 | - if @issues.any? | 1 | - if @issues.any? |
| 2 | - @issues.group_by(&:project).each do |group| | 2 | - @issues.group_by(&:project).each do |group| |
| 3 | - %div.ui-box | 3 | + .ui-box.small-box |
| 4 | - project = group[0] | 4 | - project = group[0] |
| 5 | .title | 5 | .title |
| 6 | = link_to_project project | 6 | = link_to_project project |
| 7 | - | ||
| 8 | - %i.icon-angle-right | ||
| 9 | - | ||
| 10 | - = link_to 'issues', project_issues_path(project) | 7 | + = link_to 'show all', project_issues_path(project), class: 'pull-right' |
| 11 | 8 | ||
| 12 | %ul.well-list.issues-list | 9 | %ul.well-list.issues-list |
| 13 | - group[1].each do |issue| | 10 | - group[1].each do |issue| |
app/views/shared/_merge_requests.html.haml
| 1 | - if @merge_requests.any? | 1 | - if @merge_requests.any? |
| 2 | - @merge_requests.group_by(&:project).each do |group| | 2 | - @merge_requests.group_by(&:project).each do |group| |
| 3 | - .ui-box | 3 | + .ui-box.small-box |
| 4 | - project = group[0] | 4 | - project = group[0] |
| 5 | .title | 5 | .title |
| 6 | = link_to_project project | 6 | = link_to_project project |