Browse Source

Fix width for pending and requesting contacts

JC Brand 11 years ago
parent
commit
482d09777c

+ 10 - 3
css/converse.css

@@ -873,6 +873,13 @@ dl.add-converse-contact {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+#conversejs #converse-roster span.req-contact-name {
+  width: 70%;
+}
+#conversejs #converse-roster span.pending-contact-name,
+#conversejs #converse-roster a.open-chat {
+  width: 80%;
+}
 #converse-roster dd span {
   padding: 0 5px 0 0;
 }
@@ -980,9 +987,6 @@ dl.add-converse-contact {
 #conversejs #converse-roster dd:hover a.remove-xmpp-contact {
   display: inline-block;
 }
-#conversejs #converse-roster a.open-chat {
-  width: 80%;
-}
 #conversejs .chatbox,
 #conversejs .chatroom {
   height: 25px;
@@ -1300,6 +1304,9 @@ input.custom-xmpp-status {
 #conversejs .chatbox .dropdown dd ul li:hover {
   background-color: #bed6e5;
 }
+#conversejs .chatbox .dropdown dd.search-xmpp ul li:hover {
+  background-color: #bed6e5;
+}
 #conversejs .xmpp-status-menu li a {
   width: 100%;
 }

+ 13 - 4
less/converse.less

@@ -968,6 +968,15 @@ dl.add-converse-contact {
     text-overflow: ellipsis;
 }
 
+#conversejs #converse-roster span.req-contact-name {
+    width: 70%;
+}
+
+#conversejs #converse-roster span.pending-contact-name,
+#conversejs #converse-roster a.open-chat {
+    width: 80%;
+}
+
 #converse-roster dd span {
     padding: 0 5px 0 0;
 }
@@ -1096,10 +1105,6 @@ dl.add-converse-contact {
     display: inline-block;
 }
 
-#conversejs #converse-roster a.open-chat {
-    width: 80%;
-}
-
 #conversejs .chatbox,
 #conversejs .chatroom {
     height: 25px;
@@ -1477,6 +1482,10 @@ input.custom-xmpp-status {
     background-color: #bed6e5;
 }
 
+#conversejs .chatbox .dropdown dd.search-xmpp ul li:hover {
+    background-color: #bed6e5;
+}
+
 #conversejs .xmpp-status-menu li a {
     width: 100%;
 }

+ 4 - 4
mockup/controlbox.html

@@ -191,14 +191,14 @@
                         <a href="#" class="group-toggle icon-opened" title="Click to hide these contacts">Contact Requests</a>
                     </dt>
                     <dd class="offline requesting-xmpp-contact">
-                        <span>Bob Skinstad</span>
+                        <span class="req-contact-name">Bob Skinstad</span>
                         <span class="request-actions">
                             <a class="accept-xmpp-request icon-checkmark" title="Click here to accept this contact's request" href="#"></a>
                             <a class="decline-xmpp-request icon-close" title="Click here to decline this contact's request" href="#"></a>
                         </span>
                     </dd>
                     <dd class="offline requesting-xmpp-contact">
-                        <span>André Vos</span>
+                        <span class="req-contact-name">André Vos</span>
                         <span class="request-actions">
                             <a class="accept-xmpp-request icon-checkmark" title="Click here to accept this contact's request" href="#"></a>
                             <a class="decline-xmpp-request icon-close" title="Click here to decline this contact's request" href="#"></a>
@@ -208,10 +208,10 @@
                     <dt id="pending-xmpp-contacts" style="display: block;">
                         <a href="#" class="group-toggle icon-opened" title="Click to hide these contacts">Pending Contacts</a>
                     </dt>
-                    <dd class="offline pending-xmpp-contact"><span>Rassie Erasmus</span>
+                    <dd class="offline pending-xmpp-contact"><span class="pending-contact-name">Rassie Erasmus</span>
                         <a class="remove-xmpp-contact icon-remove" title="Click to remove this contact" href="#"></a>
                     </dd>
-                    <dd class="offline pending-xmpp-contact"><span>Victor Matfield</span>
+                    <dd class="offline pending-xmpp-contact"><span class="pending-contact-name">Victor Matfield</span>
                         <a class="remove-xmpp-contact icon-remove" title="Click to remove this contact" href="#"></a>
                     </dd>
                 </dl>

+ 1 - 1
src/templates/pending_contact.html

@@ -1 +1 @@
-<span>{{fullname}}</span> <a class="remove-xmpp-contact icon-remove" title="{{desc_remove}}" href="#"></a>
+<span class="pending-contact-name">{{fullname}}</span> <a class="remove-xmpp-contact icon-remove" title="{{desc_remove}}" href="#"></a>

+ 1 - 1
src/templates/requesting_contact.html

@@ -1,4 +1,4 @@
-<span>{{fullname}}</span>
+<span class="req-contact-name">{{fullname}}</span>
 <span class="request-actions">
     <a class="accept-xmpp-request icon-checkmark" title="{{desc_accept}}" href="#"></a>
     <a class="decline-xmpp-request icon-close" title="{{desc_decline}}" href="#"></a>