Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
1ba68dc8
Commit
1ba68dc8
authored
Oct 03, 2016
by
Mathias Ertl
Committed by
JC Brand
Oct 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Csp compat (#695)
* Remove some inline CSS style to improve CSP compatibility * update changelog
parent
fa4e51f3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
2 deletions
+14
-2
docs/CHANGES.md
docs/CHANGES.md
+1
-0
sass/_controlbox.scss
sass/_controlbox.scss
+6
-0
sass/_roster.scss
sass/_roster.scss
+5
-0
src/templates/add_contact_dropdown.html
src/templates/add_contact_dropdown.html
+1
-1
src/templates/controlbox_toggle.html
src/templates/controlbox_toggle.html
+1
-1
No files found.
docs/CHANGES.md
View file @
1ba68dc8
...
...
@@ -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]
...
...
sass/_controlbox.scss
View file @
1ba68dc8
...
...
@@ -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
{
...
...
sass/_roster.scss
View file @
1ba68dc8
...
...
@@ -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
{
...
...
src/templates/add_contact_dropdown.html
View file @
1ba68dc8
...
...
@@ -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>
src/templates/controlbox_toggle.html
View file @
1ba68dc8
<span
class=
"conn-feedback"
>
{{label_toggle}}
</span>
<span
style=
"display: none"
id=
"online-count"
>
(0)
</span>
<span
id=
"online-count"
>
(0)
</span>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment