diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-31 01:41:11 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-31 01:41:11 +0400 |
| commit | 1a97db413b03881f0ce4307811181776e3d6e408 (patch) | |
| tree | 05d1acf44869d2fa6c89fa15cc6b89111fc3a9e9 /app/views | |
| parent | e02aec662751d545b70fe014c757d7061c577016 (diff) | |
Simplify issue-box style
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 2c816e788de..695eb225754 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -32,13 +32,13 @@ .issue-box{ class: issue_box_class(@issue) } .state.clearfix - .state-label.col-sm-2.col-xs-12 + .state-label - if @issue.closed? Closed - else Open - %span.creator.col-sm-9.col-xs-12 + .creator Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)} %h4.title @@ -73,4 +73,4 @@ = label.name -.voting_notes#notes= render "projects/notes/notes_with_form"
\ No newline at end of file +.voting_notes#notes= render "projects/notes/notes_with_form" diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 435e916c6dc..f1aaba2010d 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -1,6 +1,6 @@ .issue-box{ class: issue_box_class(@merge_request) } .state.clearfix - %span.state-label.col-sm-2.col-xs-12 + .state-label - if @merge_request.merged? Merged - elsif @merge_request.closed? @@ -8,7 +8,7 @@ - else Open - %span.creator.col-sm-9.col-xs-12 + .creator Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} %h4.title diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index e33f4e5273c..d355f258827 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -22,14 +22,14 @@ .issue-box{ class: issue_box_class(@milestone) } .state.clearfix - .state-label.col-sm-2.col-xs-12 + .state-label - if @milestone.closed? Closed - elsif @milestone.expired? Expired - else Open - %span.creator.col-sm-9.col-xs-12 + .creator = @milestone.expires_at %h4.title |