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
482d0977
Commit
482d0977
authored
Jul 23, 2014
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix width for pending and requesting contacts
parent
2886479b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
13 deletions
+29
-13
css/converse.css
css/converse.css
+10
-3
less/converse.less
less/converse.less
+13
-4
mockup/controlbox.html
mockup/controlbox.html
+4
-4
src/templates/pending_contact.html
src/templates/pending_contact.html
+1
-1
src/templates/requesting_contact.html
src/templates/requesting_contact.html
+1
-1
No files found.
css/converse.css
View file @
482d0977
...
...
@@ -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%
;
}
...
...
less/converse.less
View file @
482d0977
...
...
@@ -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%;
}
...
...
mockup/controlbox.html
View file @
482d0977
...
...
@@ -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>
...
...
src/templates/pending_contact.html
View file @
482d0977
<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>
src/templates/requesting_contact.html
View file @
482d0977
<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>
...
...
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