Skip to content

Commit 6c777ff

Browse files
committed
Improve milestone show page
1 parent 676a9a7 commit 6c777ff

File tree

3 files changed

+26
-30
lines changed

3 files changed

+26
-30
lines changed
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
$ ->
2-
$('.milestone-issue-filter tr[data-closed]').addClass('hide')
2+
$('.milestone-issue-filter li[data-closed]').addClass('hide')
33

44
$('.milestone-issue-filter ul.nav li a').click ->
55
$('.milestone-issue-filter li').toggleClass('active')
6-
$('.milestone-issue-filter tr[data-closed]').toggleClass('hide')
6+
$('.milestone-issue-filter li[data-closed]').toggleClass('hide')
77
false
88

9-
$('.milestone-merge-requests-filter tr[data-closed]').addClass('hide')
9+
$('.milestone-merge-requests-filter li[data-closed]').addClass('hide')
1010

1111
$('.milestone-merge-requests-filter ul.nav li a').click ->
1212
$('.milestone-merge-requests-filter li').toggleClass('active')
13-
$('.milestone-merge-requests-filter tr[data-closed]').toggleClass('hide')
13+
$('.milestone-merge-requests-filter li[data-closed]').toggleClass('hide')
1414
false

app/assets/stylesheets/gitlab_bootstrap/common.scss

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/** PILLS & TABS**/
2626
.nav-pills {
2727
.active a {
28+
background: $primary_color;
2829
}
2930

3031
> li > a {

app/views/milestones/show.html.haml

+21-26
Original file line numberDiff line numberDiff line change
@@ -38,51 +38,46 @@
3838
= gfm escape_once(@milestone.title)
3939

4040
.ui-box-body
41-
%h5
41+
%p
4242
Progress:
43-
%small
44-
#{@milestone.closed_items_count} closed
45-
–
46-
#{@milestone.open_items_count} open
43+
#{@milestone.closed_items_count} closed
44+
–
45+
#{@milestone.open_items_count} open
4746
%span.right= @milestone.expires_at
4847
.progress.progress-info
4948
.bar{style: "width: #{@milestone.percent_complete}%;"}
5049

5150

5251
- if @milestone.description.present?
53-
.bottom_box_content
52+
.ui-box-bottom
5453
= preserve do
5554
= markdown @milestone.description
5655

5756

5857
.row
5958
.span6
60-
%table.milestone-issue-filter
61-
%thead
62-
%tr
63-
%th
64-
%ul.nav.nav-pills
65-
%li.active= link_to('Open Issues', '#')
66-
%li=link_to('All Issues', '#')
67-
- @issues.each do |issue|
68-
%tr{data: {closed: issue.closed}}
69-
%td
59+
.ui-box.milestone-issue-filter
60+
.title
61+
%ul.nav.nav-pills
62+
%li.active= link_to('Open Issues', '#')
63+
%li=link_to('All Issues', '#')
64+
%ul.well-list
65+
- @issues.each do |issue|
66+
%li{data: {closed: issue.closed}}
7067
= link_to [@project, issue] do
7168
%span.badge.badge-info ##{issue.id}
7269
–
7370
= link_to_gfm truncate(issue.title, length: 60), [@project, issue]
7471

7572
.span6
76-
%table.milestone-merge-requests-filter
77-
%thead
78-
%tr
79-
%th
80-
%ul.nav.nav-pills
81-
%li.active= link_to('Open Merge Requests', '#')
82-
%li=link_to('All Merge Requests', '#')
83-
- @merge_requests.each do |merge_request|
84-
%tr{data: {closed: merge_request.closed}}
85-
%td
73+
.ui-box.milestone-merge-requests-filter
74+
.title
75+
%ul.nav.nav-pills
76+
%li.active= link_to('Open Merge Requests', '#')
77+
%li=link_to('All Merge Requests', '#')
78+
%ul.well-list
79+
- @merge_requests.each do |merge_request|
80+
%li{data: {closed: merge_request.closed}}
8681
= link_to [@project, merge_request] do
8782
%span.badge.badge-info ##{merge_request.id}
8883
–

0 commit comments

Comments
 (0)