Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Update CSS so that tests pass.

Browse Source
This commit is contained in:
JC Brand 2016-10-03 19:51:15 +02:00
parent 1ba68dc8b2
commit d200f24bea
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
css/converse.css
View File

@ -1655,33 +1655,37 @@
#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom div.room-info { #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom div.room-info {
clear: left; clear: left;
width: 100%; } width: 100%; }
#conversejs #controlbox .dropdown a { #conversejs #controlbox .dropdown {
width: 148px; /* Custom addition for CSP */ }
display: inline-block; #conversejs #controlbox .dropdown a {
line-height: 25px; } width: 148px;
#conversejs #controlbox .dropdown li { display: inline-block;
list-style: none; line-height: 25px; }
padding-left: 0; } #conversejs #controlbox .dropdown li {
#conversejs #controlbox .dropdown dd ul { list-style: none;
padding: 0; padding-left: 0; }
list-style: none; #conversejs #controlbox .dropdown dd ul {
position: absolute; padding: 0;
left: 0; list-style: none;
top: 0; position: absolute;
border: 1px solid #B1BFC4; left: 0;
width: 100%; top: 0;
z-index: 21; border: 1px solid #B1BFC4;
background-color: #FCFDFD; } width: 100%;
#conversejs #controlbox .dropdown dd ul li:hover { z-index: 21;
background-color: #DCF9F6; }
#conversejs #controlbox .dropdown dd.search-xmpp ul {
box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); }
#conversejs #controlbox .dropdown dd.search-xmpp ul li:hover {
background-color: #FCFDFD; } background-color: #FCFDFD; }
#conversejs #controlbox .dropdown dt a span { #conversejs #controlbox .dropdown dd ul li:hover {
cursor: pointer; background-color: #DCF9F6; }
display: block; #conversejs #controlbox .dropdown dd.search-xmpp {
padding: 4px 7px 0 5px; } display: none; }
#conversejs #controlbox .dropdown dd.search-xmpp ul {
box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); }
#conversejs #controlbox .dropdown dd.search-xmpp ul li:hover {
background-color: #FCFDFD; }
#conversejs #controlbox .dropdown dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px; }
#conversejs #controlbox #select-xmpp-status { #conversejs #controlbox #select-xmpp-status {
float: right; float: right;
margin-right: 0.5em; } margin-right: 0.5em; }
@ -1836,9 +1840,12 @@
height: calc(100% - 50px - 20px); height: calc(100% - 50px - 20px);
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
padding-bottom: 3em; } padding-bottom: 3em;
/* Custom addition for CSP */ }
#conversejs #converse-roster.no-contact-requests { #conversejs #converse-roster.no-contact-requests {
height: calc(100% - 25px - 20px); } height: calc(100% - 25px - 20px); }
#conversejs #converse-roster #online-count {
display: none; }
#conversejs #converse-roster .search-xmpp ul li.chat-info { #conversejs #converse-roster .search-xmpp ul li.chat-info {
padding-left: 10px; } padding-left: 10px; }
#conversejs #converse-roster .roster-filter-group { #conversejs #converse-roster .roster-filter-group {

2
docs/CHANGES.md
View File

@ -6,7 +6,7 @@
- New event ['rosterContactsFetched'](https://conversejs.org/docs/html/development.html#rosterContactsFetched) [jcbrand] - New event ['rosterContactsFetched'](https://conversejs.org/docs/html/development.html#rosterContactsFetched) [jcbrand]
- New event ['rosterGroupsFetched'](https://conversejs.org/docs/html/development.html#rosterGroupsFetched) [jcbrand] - New event ['rosterGroupsFetched'](https://conversejs.org/docs/html/development.html#rosterGroupsFetched) [jcbrand]
- HTML templates are now loaded in the respective modules/plugins. [jcbrand] - HTML templates are now loaded in the respective modules/plugins. [jcbrand]
- Start improving Content-Security-Policy compatibility by removing inline CSS. - Start improving Content-Security-Policy compatibility by removing inline CSS. [mathiasertl]
## 2.0.0 (2016-09-16) ## 2.0.0 (2016-09-16)
- #656 Online users count not shown initially [amanzur] - #656 Online users count not shown initially [amanzur]