From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Fri, 5 Apr 2019 19:00:04 +0000 (-0400)
Subject: Bug 1541484 - Move the bug type from header to module and de-emphasize it so it’s... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9aaecb72fa3ba879d0066d24463850cc0b5916c2;p=thirdparty%2Fbugzilla.git

Bug 1541484 - Move the bug type from header to module and de-emphasize it so it’s not confused with bug status
---

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 9ec843360..5db09f633 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -225,12 +225,6 @@
         no_label = 1
         hide_on_edit = 1
     %]
-      [% IF bug.bug_type %]
-      <span class="bug-type-label iconic-text" data-type="[% bug.bug_type FILTER html %]">
-        <span class="icon" aria-hidden="true"></span>
-        [%~ bug.bug_type FILTER html ~%]
-      </span>
-      [% END %]
       <b class="bz_status_[% bug.bug_status FILTER html %]">
         [% bug.bug_status FILTER html %]
         [%+ bug.resolution FILTER html IF bug.resolution %]
@@ -472,10 +466,12 @@
     [% WRAPPER bug_modal/field.html.tmpl
         field      = bug_fields.bug_type
         field_type = constants.FIELD_TYPE_SINGLE_SELECT
-        hide_on_view = 1  # Because it's displayed on the header
         help       = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_type"
     %]
-      [% bug.bug_type FILTER html %]
+      <span class="bug-type-label iconic-text" data-type="[% bug.bug_type FILTER html %]">
+        <span class="icon" aria-hidden="true"></span>
+        [%~ bug.bug_type FILTER html ~%]
+      </span>
     [% END %]
 
     [%# importance %]
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 5964b5e58..faf543ba8 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -2835,8 +2835,8 @@ pre.comment-text {
 /* Bug types */
 
 :root {
-  --bug-type-color-defect: #D62935;
-  --bug-type-color-enhancement: #2BC028;
+  --bug-type-color-defect: #EA3C3D;
+  --bug-type-color-enhancement: #2ABA27;
   --bug-type-color-task: #2886C9;
 }
 
@@ -2848,12 +2848,12 @@ pre.comment-text {
 }
 
 .bug-type-label[data-type="defect"] .icon::before {
-  content: '\E85F';
+  content: '\E3AC';
   color: var(--bug-type-color-defect);
 }
 
 .bug-type-label[data-type="enhancement"] .icon::before {
-  content: '\E862';
+  content: '\E146';
   color: var(--bug-type-color-enhancement);
 }
 
@@ -2867,27 +2867,6 @@ pre.comment-text {
   vertical-align: middle;
 }
 
-.bug-type-label.iconic-text {
-  border-radius: .2em;
-  padding: .2em .4em .2em .2em;
-  color: #FFF;
-  background-color: #666;
-  line-height: 16px;
-  font-weight: 600;
-}
-
-.bug-type-label.iconic-text[data-type="defect"] {
-  background-color: var(--bug-type-color-defect);
-}
-
-.bug-type-label.iconic-text[data-type="enhancement"] {
-  background-color: var(--bug-type-color-enhancement);
-}
-
-.bug-type-label.iconic-text[data-type="task"] {
-  background-color: var(--bug-type-color-task);
-}
-
 .bug-type-label.iconic-text .icon {
   margin-right: .2em;
   font-size: 16px;
@@ -2895,6 +2874,5 @@ pre.comment-text {
 }
 
 .bug-type-label.iconic-text .icon::before {
-  color: #FFF !important;
   vertical-align: bottom;
 }