diff options
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 16 | ||||
| -rw-r--r-- | app/views/shared/_issues.html.haml | 7 | ||||
| -rw-r--r-- | app/views/shared/_merge_requests.html.haml | 2 |
3 files changed, 19 insertions, 6 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index 08202211e53..bbce30f347a 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -15,6 +15,22 @@ border: 1px solid #CCC; word-wrap: break-word; + &.small-box { + margin-bottom: 10px; + + .title { + font-size: 13px; + line-height: 30px; + + a { + color: #666; + &:hover { + text-decoration: underline; + } + } + } + } + &.ui-box-show { margin:20px 0; background: #FFF; diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 33f8f5f4ad1..9fa574cebc0 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,13 +1,10 @@ - if @issues.any? - @issues.group_by(&:project).each do |group| - %div.ui-box + .ui-box.small-box - project = group[0] .title = link_to_project project - - %i.icon-angle-right - - = link_to 'issues', project_issues_path(project) + = link_to 'show all', project_issues_path(project), class: 'pull-right' %ul.well-list.issues-list - group[1].each do |issue| diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 935a7a7f7c0..c83620dd7f4 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,6 +1,6 @@ - if @merge_requests.any? - @merge_requests.group_by(&:project).each do |group| - .ui-box + .ui-box.small-box - project = group[0] .title = link_to_project project |