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

CSS fixes.

Browse Source 
- Pending contacts were not aligned to action icons next to them.
- Invite contacts search box went out of bounds on FF
This commit is contained in:
JC Brand 2015-11-02 00:28:00 +00:00
parent 1dffa823dd
commit bf524424c2
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
css/converse.css
View File

@ -1811,7 +1811,11 @@
width: 80%; } 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;
margin-bottom: 0.3em;
float: right; } float: right; }
#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name {
width: 69%;
padding: 0; }
#conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span { #conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span {
font-size: 16px; font-size: 16px;
float: left; float: left;
@ -1826,7 +1830,8 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; } text-overflow: ellipsis; }
#conversejs #converse-roster .roster-contacts dd span { #conversejs #converse-roster .roster-contacts dd span {
padding: 0 0.5em 0 0; } padding: 0 0.5em 0 0;
height: 100%; }
#conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request { #conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request {
margin-left: 5px; } margin-left: 5px; }
#conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact { #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
@ -1837,9 +1842,6 @@
color: #818479; } color: #818479; }
#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 {
width: 69%;
padding: 0; }
#conversejs .chat-head-chatroom { #conversejs .chat-head-chatroom {
background-color: #E76F51; } background-color: #E76F51; }
@ -1881,8 +1883,7 @@
height: 100%; height: 100%;
min-width: 200px; } min-width: 200px; }
#conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content { #conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content {
margin-top: 0.5em; padding: 0 0.5em 0 0.5em; }
padding: 0.5em 0.5em 0 0.5em; }
#conversejs .chatroom .box-flyout .chatroom-body .mentioned { #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
font-weight: bold; } font-weight: bold; }
#conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room { #conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room {
@ -1935,7 +1936,7 @@
margin: 0.3em; } margin: 0.3em; }
#conversejs .chatroom .room-invite .invited-contact { #conversejs .chatroom .room-invite .invited-contact {
margin: -1px 0 0 -1px; margin: -1px 0 0 -1px;
width: 100px; width: 100%;
border: 1px solid #999; } border: 1px solid #999; }
#conversejs .chatroom .room-invite .invited-contact.tt-input { #conversejs .chatroom .room-invite .invited-contact.tt-input {
width: 100%; width: 100%;

6
sass/_chatrooms.scss
View File

@ -43,8 +43,8 @@
height: 100%; height: 100%;
min-width: $chat-width; min-width: $chat-width;
.chat-content { .chat-content {
margin-top: 0.5em; // There's an annoying Chrome box-sizing bug which prevents us from adding 0.5em padding here.
padding: 0.5em 0.5em 0 0.5em; // Work around a weird box-sizing issue in Chromium related to bottom padding. padding: 0 0.5em 0 0.5em;
} }
} }
.mentioned { .mentioned {
@ -112,7 +112,7 @@
margin: 0.3em; margin: 0.3em;
.invited-contact { .invited-contact {
margin: -1px 0 0 -1px; margin: -1px 0 0 -1px;
width: 100px; width: 100%;
border: 1px solid #999; border: 1px solid #999;
&.tt-input { &.tt-input {
width: 100%; width: 100%;

10
sass/_roster.scss
View File

@ -97,8 +97,13 @@
&.requesting-xmpp-contact { &.requesting-xmpp-contact {
&.request-actions { &.request-actions {
margin-left: 0.5em; margin-left: 0.5em;
margin-bottom: 0.3em;
float: right; float: right;
} }
.req-contact-name {
width: 69%;
padding: 0;
}
} }
&.current-xmpp-contact span { &.current-xmpp-contact span {
font-size: 16px; font-size: 16px;
@ -118,6 +123,7 @@
} }
span { span {
padding: 0 0.5em 0 0; padding: 0 0.5em 0 0;
height: 100%;
} }
a { a {
&.decline-xmpp-request { &.decline-xmpp-request {
@ -137,9 +143,5 @@
&.pending-contact-name { &.pending-contact-name {
width: 80%; width: 80%;
} }
&.req-contact-name {
width: 69%;
padding: 0;
}
} }
} }