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
9c88aa19
Commit
9c88aa19
authored
Aug 25, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better textarea styling. Ensure all boxes are same height.
parent
dfe76e42
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
18 deletions
+39
-18
converse.css
converse.css
+29
-16
converse.js
converse.js
+1
-1
mockup.html
mockup.html
+9
-1
No files found.
converse.css
View file @
9c88aa19
...
...
@@ -78,7 +78,7 @@ span.spinner.hor_centered {
font-size
:
100%
;
border-top-right-radius
:
4px
;
border-top-left-radius
:
4px
;
padding
:
3px
0
3px
7
px
;
padding
:
3px
0
0
3
px
;
}
.chat-head-chatbox
{
...
...
@@ -91,7 +91,7 @@ span.spinner.hor_centered {
}
.chatroom
.chat-body
{
height
:
27
2
px
;
height
:
27
4
px
;
background-color
:
white
;
border-bottom-right-radius
:
4px
;
border-bottom-left-radius
:
4px
;
...
...
@@ -110,11 +110,12 @@ span.spinner.hor_centered {
.chatroom
.participants
{
float
:
left
;
height
:
27
2
px
;
height
:
27
4
px
;
background-color
:
white
;
overflow
:
auto
;
border-left
:
1px
solid
#AAA
;
max-width
:
99px
;
border-bottom-right-radius
:
4px
;
}
.participants
ul
.participant-list
li
{
...
...
@@ -131,11 +132,6 @@ ul.participant-list li.moderator {
color
:
#FE0007
;
}
.chatroom
form
.sendXMPPMessage
{
-webkit-border-bottom-right-radius
:
0
;
border-bottom-right-radius
:
0
;
}
.chatroom
.participant-list
{
list-style
:
none
;
}
...
...
@@ -151,7 +147,7 @@ ul.participant-list li.moderator {
padding
:
0.3em
;
font-size
:
13px
;
color
:
rgb
(
79
,
79
,
79
);
height
:
1
73
px
;
height
:
1
80
px
;
width
:
190px
;
overflow-y
:
auto
;
border
:
0
;
...
...
@@ -159,6 +155,10 @@ ul.participant-list li.moderator {
line-height
:
1.3em
;
}
.chatroom
.chat-content
{
height
:
200px
;
}
.chat-info
{
color
:
#666666
;
}
...
...
@@ -731,7 +731,7 @@ form.sendXMPPMessage {
background
:
white
;
border
:
0
;
border-top
:
1px
solid
#BBB
;
padding
:
0
.5em
;
padding
:
0
;
margin
:
0
;
position
:
relative
;
-webkit-border-radius
:
4px
;
...
...
@@ -746,11 +746,30 @@ form.sendXMPPMessage {
width
:
200px
;
}
.chatroom
form
.sendXMPPMessage
{
-webkit-border-bottom-right-radius
:
0
;
border-bottom-right-radius
:
0
;
height
:
65px
;
}
.chat-textarea
{
box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
border
:
0
;
width
:
100%
;
padding
:
3px
;
border-radius
:
4px
;
resize
:
none
;
height
:
65px
;
}
ul
.chat-toolbar
{
font-size
:
14px
;
margin
:
0
;
padding
:
0
5px
0
0
;
float
:
right
;
display
:
inline-block
;
height
:
20px
;
}
ul
.chat-toolbar
li
{
...
...
@@ -769,12 +788,6 @@ form#set-custom-xmpp-status {
padding
:
0
;
}
.chat-textarea
{
border
:
0
;
width
:
194px
;
height
:
58px
;
}
.chat-textarea-chatbox-selected
{
border
:
1px
solid
#578308
;
margin
:
0
;
...
...
converse.js
View file @
9c88aa19
...
...
@@ -587,7 +587,7 @@
return
;
}
var
img_src
=
'
data:
'
+
this
.
model
.
get
(
'
image_type
'
)
+
'
;base64,
'
+
this
.
model
.
get
(
'
image
'
),
canvas
=
$
(
'
<canvas height="3
5px" width="35
px" class="avatar"></canvas>
'
),
canvas
=
$
(
'
<canvas height="3
3px" width="33
px" class="avatar"></canvas>
'
),
ctx
=
canvas
.
get
(
0
).
getContext
(
'
2d
'
),
img
=
new
Image
();
// Create new Image object
img
.
onload
=
function
()
{
...
...
mockup.html
View file @
9c88aa19
...
...
@@ -193,7 +193,7 @@
<div
class=
"chat-head chat-head-chatbox"
>
<a
class=
"close-chatbox-button icon-close"
></a>
<a
href=
"http://opkode.com"
target=
"_blank"
class=
"user"
>
<canvas
height=
"3
5px"
width=
"35
px"
class=
"avatar"
style=
"background-color: black"
></canvas>
<canvas
height=
"3
3px"
width=
"33
px"
class=
"avatar"
style=
"background-color: black"
></canvas>
<div
class=
"chat-title"
>
JC Brand
</div>
</a>
<p
class=
"user-custom-message"
></p>
...
...
@@ -219,6 +219,10 @@
<span
class=
"chat-message-content"
>
Supercalifragilisticexpialidociousstillnotlongenough
</span>
</div>
<div
class=
"chat-event"
>
JC Brand is busy
</div>
<div
class=
"chat-message "
>
<span
class=
"chat-message-me"
>
19:43 me:
</span>
<span
class=
"chat-message-content"
>
Another message to check that scrolling works.
</span>
</div>
</div>
<form
class=
"sendXMPPMessage"
action=
""
method=
"post"
>
<ul
class=
"chat-toolbar"
>
...
...
@@ -261,6 +265,10 @@
<span
class=
"chat-message-me"
>
19:42 me:
</span>
<span
class=
"chat-message-content"
>
Supercalifragilisticexpialidociousstillnotlongenough
</span>
</div>
<div
class=
"chat-message "
>
<span
class=
"chat-message-room"
>
19:43 Obi-wan Kenobi, Jedi Master:
</span>
<span
class=
"chat-message-content"
>
Another message to check that scrolling works.
</span>
</div>
</div>
<form
class=
"sendXMPPMessage"
action=
""
method=
"post"
>
<textarea
type=
"text"
class=
"chat-textarea"
placeholder=
"Message"
></textarea>
...
...
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