diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 916186880811b8eed8344855b7b3ada48829fb1b..7afa74400c98982f58bc4ba7062e5c1aa06b75a5 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -88,11 +88,15 @@ pre.well-pre { /** Big Labels **/ .state-label { font-size: 14px; - padding: 6px 25px; + padding: 9px 25px; text-align: center; - @include border-radius(4px); text-shadow: none; - margin-left: 10px; + margin-right: 20px; + + &.state-label-blue { + background: #31708f; + color: #FFF; + } &.state-label-green { background: #4A4; diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss index a6573fa0e5f09dbececc7334e52c4daecf38bb5f..3baad20caabe7f7d8e07504cff2cb310e9f8df04 100644 --- a/app/assets/stylesheets/generic/issue_box.scss +++ b/app/assets/stylesheets/generic/issue_box.scss @@ -17,11 +17,10 @@ margin-bottom: 0; } - .creator { - padding: 8px 25px; - background: #eee; + .state { + height: 34px; border-bottom: 1px solid #DDD; - color: #777; + line-height: 32px; } .title { diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 16981edd98076c7bfeaed7b09da1217e6d6cf2cf..0374992ebfc1c3137f1072a7ffae1e9107d90a83 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -84,4 +84,12 @@ module IssuesHelper def milestone_options object options_from_collection_for_select(@project.milestones.active, 'id', 'title', object.milestone_id) end + + def issue_alert_class(issue) + if issue.closed? + 'alert-danger' + else + 'alert-success' + end + end end diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 5e3f82fe9ceffdc29bc6fd96569a692f8d95cbdc..62f061bb079db32e1b81a91cdc9fa46904b14b07 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -41,4 +41,14 @@ module MergeRequestsHelper "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" end end + + def merge_request_alert_class(merge_request) + if merge_request.merged? + 'alert-info' + elsif merge_request.closed? + 'alert-danger' + else + 'alert-success' + end + end end diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 101f1ddbd1b9e70f2dba265c7b54b4c616262561..3455028117d00c44b5bbf7eea6ec6459912b7198 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -1,11 +1,6 @@ %h3.page-title Issue ##{@issue.iid} - - if @issue.closed? - %span.state-label.state-label-red Closed - - else - %span.state-label.state-label-green Open - %span.pull-right - if can?(current_user, :write_issue, @project) = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do @@ -35,8 +30,14 @@ = @issue.milestone.title .issue-box - .creator - Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)} + .state{ class: issue_alert_class(@issue) } + - if @issue.closed? + %span.state-label.state-label-red Closed + - else + %span.state-label.state-label-green Open + + %span.creator + Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)} %h4.title = gfm escape_once(@issue.title) 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 15c3d311bdc73f29beb70f5d1e69aa9bc2e8bb06..8c85318ca32341b2248ce46a5cd0110df74d7aee 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,16 @@ .issue-box - .creator - Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} + .state{ class: merge_request_alert_class(@merge_request) } + - if @merge_request.merged? + %span.state-label.state-label-blue + Merged + - elsif @merge_request.closed? + %span.state-label.state-label-red + Closed + - else + %span.state-label.state-label-green + Open + %span.creator + Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} %h4.title = gfm escape_once(@merge_request.title) @@ -16,13 +26,13 @@ = markdown @merge_request.description - if @merge_request.closed? - .description.alert-danger + .description %span %i.icon-remove Closed by #{link_to_member(@project, @merge_request.closed_event.author)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}. - if @merge_request.merged? - .description.alert-success + .description %span %i.icon-ok Merged by #{link_to_member(@project, @merge_request.merge_event.author)} diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 8c63ce662251f8b4f79acaf12dfb79e14630b250..b27522e46a4e4957da874a53ea4788171f9982b2 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -1,19 +1,6 @@ %h3.page-title = "Merge Request ##{@merge_request.iid}" - - if @merge_request.merged? - %span.state-label.state-label-green - %i.icon-ok - Merged - - elsif @merge_request.closed? - %span.state-label.state-label-red - Closed - - else - %span.state-label.state-label-green - Open - - - %span.pull-right - if can?(current_user, :modify_merge_request, @merge_request) - if @merge_request.opened?