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

Various small CSS fixes and improvements.

Browse Source
This commit is contained in:
JC Brand 2015-10-30 18:47:13 +00:00
parent 5a7340b387
commit bf3891569e
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/converse.css
View File

@ -1246,7 +1246,7 @@
#conversejs .chat-head.chat-head-chatbox { #conversejs .chat-head.chat-head-chatbox {
background-color: #F4A261; } background-color: #F4A261; }
#conversejs .chatbox-btn { #conversejs .chatbox-btn {
border-radius: 5px; border-radius: 4px;
border: 1px solid white; border: 1px solid white;
color: white; color: white;
cursor: pointer; cursor: pointer;
@ -1671,6 +1671,7 @@
#conversejs #controlbox .fancy-dropdown { #conversejs #controlbox .fancy-dropdown {
border: 1px solid #B1BFC4; border: 1px solid #B1BFC4;
height: 25px; height: 25px;
border-radius: 4px;
text-align: left; } text-align: left; }
#conversejs #controlbox .fancy-dropdown .choose-xmpp-status { #conversejs #controlbox .fancy-dropdown .choose-xmpp-status {
width: 155px; } width: 155px; }
@ -1741,7 +1742,7 @@
color: #D24E2B; } color: #D24E2B; }
#conversejs #controlbox .set-xmpp-status { #conversejs #controlbox .set-xmpp-status {
background: none; background: none;
margin: 0.75em 1em 0.5em 1em; } margin: 1em 1em 0.5em 1em; }
#conversejs #controlbox .set-xmpp-status .dropdown dd ul { #conversejs #controlbox .set-xmpp-status .dropdown dd ul {
z-index: 22; } z-index: 22; }
#conversejs .toggle-controlbox { #conversejs .toggle-controlbox {
@ -1822,14 +1823,15 @@
color: #818479; color: #818479;
display: block; display: block;
height: 24px; height: 24px;
line-height: 16px;
overflow-y: hidden; overflow-y: hidden;
padding: 0.5em 1em; padding: 0.3em 1em;
text-shadow: 0 1px 0 #FAFAFA; } text-shadow: 0 1px 0 #FAFAFA; }
#conversejs #converse-roster .roster-contacts dd:hover { #conversejs #converse-roster .roster-contacts dd:hover {
background-color: #DCF9F6; } background-color: #DCF9F6; }
#conversejs #converse-roster .roster-contacts dd:hover a.remove-xmpp-contact { #conversejs #converse-roster .roster-contacts dd:hover .remove-xmpp-contact {
display: inline-block; } display: inline-block; }
#conversejs #converse-roster .roster-contacts dd:hover .open-chat {
width: 80%; }
#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact.request-actions { #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact.request-actions {
margin-left: 0.5em; margin-left: 0.5em;
float: right; } float: right; }
@ -1856,8 +1858,6 @@
margin: 0; margin: 0;
display: none; display: none;
color: #818479; } color: #818479; }
#conversejs #converse-roster .roster-contacts dd a .open-chat {
width: 80%; }
#conversejs #converse-roster span.pending-contact-name { #conversejs #converse-roster span.pending-contact-name {
width: 80%; } width: 80%; }
#conversejs #converse-roster span.req-contact-name { #conversejs #converse-roster span.req-contact-name {

4
mockup/controlbox.html
View File

@ -136,13 +136,13 @@
</dd> </dd>
</dl> </dl>
<div id="converse-roster"> <div id="converse-roster">
<span class="roster-filter-group input-button-group"> <form class="pure-form roster-filter-group input-button-group">
<input class="roster-filter" placeholder="Type to filter"> <input class="roster-filter" placeholder="Type to filter">
<select class="filter-type"> <select class="filter-type">
<option value="contacts">Contacts</option> <option value="contacts">Contacts</option>
<option value="groups">Groups</option> <option value="groups">Groups</option>
</select> </select>
</span> </form>
<dl class="roster-contacts" style="display: block;"> <dl class="roster-contacts" style="display: block;">
<dt class="roster-group" style="display: block;"> <dt class="roster-group" style="display: block;">

2
mockup/index.html
View File

@ -97,7 +97,7 @@
</dd> </dd>
</dl> </dl>
<div id="converse-roster"> <div id="converse-roster">
<form class="pure-form input-button-group"> <form class="pure-form roster-filter-group input-button-group">
<input class="roster-filter" placeholder="Type to filter"> <input class="roster-filter" placeholder="Type to filter">
<select class="filter-type"> <select class="filter-type">
<option value="contacts">Contacts</option> <option value="contacts">Contacts</option>

2
sass/_chatbox.scss
View File

@ -23,7 +23,7 @@
} }
} }
.chatbox-btn { .chatbox-btn {
border-radius: 5px; border-radius: $chatbox-border-radius;
border: 1px solid white; border: 1px solid white;
color: white; color: white;
cursor: pointer; cursor: pointer;

3
sass/_controlbox.scss
View File

@ -268,6 +268,7 @@
.fancy-dropdown { .fancy-dropdown {
border: 1px solid $light-background-border-color; border: 1px solid $light-background-border-color;
height: $controlbox-dropdown-height; height: $controlbox-dropdown-height;
border-radius: 4px;
text-align: left; text-align: left;
.choose-xmpp-status { .choose-xmpp-status {
width: 155px; width: 155px;
@ -362,7 +363,7 @@
.set-xmpp-status { .set-xmpp-status {
background: none; background: none;
margin: 0.75em 1em 0.5em 1em; margin: 1em 1em 0.5em 1em;
.dropdown dd ul { .dropdown dd ul {
z-index: 22; z-index: 22;
} }

11
sass/_roster.scss
View File

@ -82,15 +82,17 @@
color: $text-color; color: $text-color;
display: block; display: block;
height: 24px; height: 24px;
line-height: 16px;
overflow-y: hidden; overflow-y: hidden;
padding: 0.5em 1em; padding: 0.3em 1em;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
&:hover { &:hover {
background-color: $highlight-color; background-color: $highlight-color;
a.remove-xmpp-contact { .remove-xmpp-contact {
display: inline-block; display: inline-block;
} }
.open-chat {
width: 80%;
}
} }
&.requesting-xmpp-contact { &.requesting-xmpp-contact {
&.request-actions { &.request-actions {
@ -128,9 +130,6 @@
display: none; display: none;
color: $text-color; color: $text-color;
} }
.open-chat {
width: 80%;
}
} }
} }
} }

2
src/templates/roster.html
View File

@ -1,4 +1,4 @@
<form class="pure-form input-button-group"> <form class="pure-form roster-filter-group input-button-group">
<input style="display: none;" class="roster-filter" placeholder="{{placeholder}}"> <input style="display: none;" class="roster-filter" placeholder="{{placeholder}}">
<select style="display: none;" class="filter-type"> <select style="display: none;" class="filter-type">
<option value="contacts">{{label_contacts}}</option> <option value="contacts">{{label_contacts}}</option>