From 4e97b5b50641a9c5f450d5b75bd03e7767a0ef84 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Thu, 26 Nov 2015 13:17:19 +0800
Subject: Bug 1228101 - The "Add" button for CC is oddly placed

---
 .../BugModal/template/en/default/bug_modal/edit.html.tmpl      | 10 ++++++++--
 extensions/BugModal/web/bug_modal.css                          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

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 c22c0a7f8..3c942d9da 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -613,7 +613,6 @@
     %]
 
       [% IF user.id %]
-        <button type="button" id="add-cc-btn" class="minor">Add</button>
         <div id="add-cc-container" style="display:none">
           [% INCLUDE global/userselect.html.tmpl
               id = "add-cc"
@@ -637,10 +636,17 @@
             END;
           %]
         </span>
-        <div id="cc-list" style="display:none"></div>
       [% ELSE %]
         <i>Nobody</i>
       [% END %]
+
+      [% IF user.id %]
+        <button type="button" id="add-cc-btn" class="minor">Add</button>
+      [% END %]
+
+      [% IF bug.cc && bug.cc.size %]
+        <div id="cc-list" style="display:none"></div>
+      [% END %]
     [% END %]
 
   [% END %]
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index 242c5cd22..c74824dad 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -343,7 +343,7 @@ input[type="number"] {
 }
 
 #add-cc-btn {
-    float: right;
+    margin-left: 8px;
 }
 
 #add-cc {
-- 
cgit v1.2.3-24-g4f1b