From 1ba68dc8b2ae278ad3d518ba2008c33f6ffa58e8 Mon Sep 17 00:00:00 2001
From: Mathias Ertl <mati@fsinf.at>
Date: Mon, 3 Oct 2016 19:45:06 +0200
Subject: [PATCH] Csp compat (#695)

* Remove some inline CSS style to improve CSP compatibility

* update changelog
---
 docs/CHANGES.md                         | 1 +
 sass/_controlbox.scss                   | 6 ++++++
 sass/_roster.scss                       | 5 +++++
 src/templates/add_contact_dropdown.html | 2 +-
 src/templates/controlbox_toggle.html    | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index aef2ac5f4..0649db7c9 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -6,6 +6,7 @@
 - New event ['rosterContactsFetched'](https://conversejs.org/docs/html/development.html#rosterContactsFetched) [jcbrand]
 - New event ['rosterGroupsFetched'](https://conversejs.org/docs/html/development.html#rosterGroupsFetched) [jcbrand]
 - HTML templates are now loaded in the respective modules/plugins. [jcbrand]
+- Start improving Content-Security-Policy compatibility by removing inline CSS.
 
 ## 2.0.0 (2016-09-16)
 - #656 Online users count not shown initially [amanzur]
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index 33770c3a9..945112a67 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -201,6 +201,12 @@
                     }
                 }
             }
+
+            /* Custom addition for CSP */
+            dd.search-xmpp {
+                display: none;
+            }
+
             dd.search-xmpp ul {
                 box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4);
                 li:hover {
diff --git a/sass/_roster.scss b/sass/_roster.scss
index c84b0a2a5..169d7b36b 100644
--- a/sass/_roster.scss
+++ b/sass/_roster.scss
@@ -13,6 +13,11 @@
         height: calc(100% - #{$controlbox-dropdown-height} - 20px);
     }
 
+    /* Custom addition for CSP */
+    #online-count {
+        display: none;
+    }
+
     .search-xmpp {
         ul {
             li.chat-info {
diff --git a/src/templates/add_contact_dropdown.html b/src/templates/add_contact_dropdown.html
index a6417116c..69adf0331 100644
--- a/src/templates/add_contact_dropdown.html
+++ b/src/templates/add_contact_dropdown.html
@@ -2,5 +2,5 @@
     <dt id="xmpp-contact-search" class="fancy-dropdown">
         <a class="toggle-xmpp-contact-form icon-plus" href="#" title="{{label_click_to_chat}}"> {{label_add_contact}}</a>
     </dt>
-    <dd class="search-xmpp" style="display:none"><ul></ul></dd>
+    <dd class="search-xmpp"><ul></ul></dd>
 </dl>
diff --git a/src/templates/controlbox_toggle.html b/src/templates/controlbox_toggle.html
index 6abf85a25..82dcbd8ae 100644
--- a/src/templates/controlbox_toggle.html
+++ b/src/templates/controlbox_toggle.html
@@ -1,2 +1,2 @@
 <span class="conn-feedback">{{label_toggle}}</span>
-<span style="display: none" id="online-count">(0)</span>
+<span id="online-count">(0)</span>