Issue box restyle

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 22 insertions, 21 deletions

diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index dcdad7e05cb..124eb53571d 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -29,12 +29,13 @@
       = link_to project_milestone_path(@project, @issue.milestone) do
         = @issue.milestone.title
 
-.issue-box
-  .state{ class: issue_alert_class(@issue) }
-    - if @issue.closed?
-      %span.state-label.state-label-red Closed
-    - else
-      %span.state-label.state-label-green Open
+.issue-box{ class: issue_box_class(@issue) }
+  .state
+    %span.state-label
+      - if @issue.closed?
+        Closed
+      - else
+        Open
 
     %span.creator
       Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
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 803e00292b0..3d0ce57c4ac 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,14 +1,13 @@
-.issue-box
-  .state{ class: merge_request_alert_class(@merge_request) }
-    - if @merge_request.merged?
-      %span.state-label.state-label-blue
+.issue-box{ class: issue_box_class(@merge_request) }
+  .state
+    %span.state-label
+      - if @merge_request.merged?
         Merged
-    - elsif @merge_request.closed?
-      %span.state-label.state-label-red
+      - elsif @merge_request.closed?
         Closed
-    - else
-      %span.state-label.state-label-green
+      - else
         Open
+
     %span.creator
       Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
 
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 1487269a8d9..06cf9946784 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -22,14 +22,15 @@
     ← To milestones list
 
 
-.issue-box
+.issue-box{ class: issue_box_class(@milestone) }
   .state
-    - if @milestone.closed?
-      %span.state-label.state-label-red Closed
-    - elsif @milestone.expired?
-      %span.state-label.state-label-red Expired
-    - else
-      %span.state-label.state-label-green Open
+    %span.state-label
+      - if @milestone.closed?
+        Closed
+      - elsif @milestone.expired?
+        Expired
+      - else
+        Open
 
   %h4.title
     = gfm escape_once(@milestone.title)