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
b5a43f81
Commit
b5a43f81
authored
Jan 26, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issues around chatroom textarea height and responsiveness
parent
d1b1433e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
111 deletions
+78
-111
css/converse.css
css/converse.css
+2
-12
css/inverse.css
css/inverse.css
+2
-12
mockup/chatroom.html
mockup/chatroom.html
+0
-1
mockup/converse.html
mockup/converse.html
+74
-78
sass/_chatbox.scss
sass/_chatbox.scss
+0
-3
sass/_chatrooms.scss
sass/_chatrooms.scss
+0
-5
No files found.
css/converse.css
View file @
b5a43f81
...
@@ -5347,10 +5347,7 @@
...
@@ -5347,10 +5347,7 @@
background
:
#818479
;
}
background
:
#818479
;
}
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-author
,
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-author
,
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-author
{
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-author
{
font-weight
:
bold
;
font-weight
:
bold
;
}
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-them
,
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-them
,
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-them
{
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-them
{
color
:
#3AA569
;
}
color
:
#3AA569
;
}
...
@@ -6292,11 +6289,8 @@
...
@@ -6292,11 +6289,8 @@
height
:
100vh
;
}
}
height
:
100vh
;
}
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
{
height
:
289px
;
border-bottom-right-radius
:
4px
;
border-bottom-right-radius
:
4px
;
border-bottom-left-radius
:
4px
;
border-bottom-left-radius
:
4px
;
height
:
-webkit-calc
(
100%
-
55px
);
height
:
calc
(
100%
-
55px
);
background-color
:
white
;
background-color
:
white
;
border-top
:
0
;
border-top
:
0
;
width
:
100%
;
width
:
100%
;
...
@@ -6330,8 +6324,7 @@
...
@@ -6330,8 +6324,7 @@
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
min-width
:
200px
;
min-width
:
200px
;
}
height
:
calc
(
100%
-
95px
);
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
{
background-color
:
#E77051
;
background-color
:
#E77051
;
...
@@ -6480,9 +6473,6 @@
...
@@ -6480,9 +6473,6 @@
width
:
100%
;
width
:
100%
;
border
:
1px
solid
#999
;
}
border
:
1px
solid
#999
;
}
@media
screen
and
(
max-width
:
767px
)
{
#conversejs
.chatbox
.box-flyout
.chatroom-body
.chat-area
{
height
:
calc
(
100vh
-
55px
);
}
}
#conversejs
.chatbox.headlines
.chat-head.chat-head-chatbox
{
#conversejs
.chatbox.headlines
.chat-head.chat-head-chatbox
{
background-color
:
#E7A151
;
}
background-color
:
#E7A151
;
}
#conversejs
.chatbox.headlines
.chat-body
{
#conversejs
.chatbox.headlines
.chat-body
{
...
...
css/inverse.css
View file @
b5a43f81
...
@@ -5403,10 +5403,7 @@ body {
...
@@ -5403,10 +5403,7 @@ body {
background
:
#818479
;
}
background
:
#818479
;
}
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-author
,
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-author
,
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-author
{
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-author
{
font-weight
:
bold
;
font-weight
:
bold
;
}
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-them
,
#converse-embedded-chat
.chatbox
.chat-body
.chat-message
.chat-msg-them
,
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-them
{
#conversejs
.chatbox
.chat-body
.chat-message
.chat-msg-them
{
color
:
#3AA569
;
}
color
:
#3AA569
;
}
...
@@ -6422,11 +6419,8 @@ body {
...
@@ -6422,11 +6419,8 @@ body {
height
:
100vh
;
}
}
height
:
100vh
;
}
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
{
height
:
289px
;
border-bottom-right-radius
:
0
;
border-bottom-right-radius
:
0
;
border-bottom-left-radius
:
0
;
border-bottom-left-radius
:
0
;
height
:
-webkit-calc
(
100%
-
62px
);
height
:
calc
(
100%
-
62px
);
background-color
:
white
;
background-color
:
white
;
border-top
:
0
;
border-top
:
0
;
width
:
100%
;
width
:
100%
;
...
@@ -6460,8 +6454,7 @@ body {
...
@@ -6460,8 +6454,7 @@ body {
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
min-width
:
100%
;
min-width
:
100%
;
}
height
:
calc
(
100%
-
95px
);
}
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
,
#converse-embedded-chat
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
{
#conversejs
.chatroom
.box-flyout
.chatroom-body
.chat-area
.new-msgs-indicator
{
background-color
:
#E77051
;
background-color
:
#E77051
;
...
@@ -6610,9 +6603,6 @@ body {
...
@@ -6610,9 +6603,6 @@ body {
width
:
100%
;
width
:
100%
;
border
:
1px
solid
#999
;
}
border
:
1px
solid
#999
;
}
@media
screen
and
(
max-width
:
767px
)
{
#conversejs
.chatbox
.box-flyout
.chatroom-body
.chat-area
{
height
:
calc
(
100vh
-
55px
);
}
}
#conversejs
.fullscreen
.chat-head-chatroom
{
#conversejs
.fullscreen
.chat-head-chatroom
{
height
:
62px
;
height
:
62px
;
font-size
:
20px
;
}
font-size
:
20px
;
}
...
...
mockup/chatroom.html
View file @
b5a43f81
...
@@ -100,7 +100,6 @@
...
@@ -100,7 +100,6 @@
<li
class=
"participant occupant"
title=
"Click to mention jabber the hut in your message."
>
<li
class=
"participant occupant"
title=
"Click to mention jabber the hut in your message."
>
<div
class=
"occupant-status occupant-online circle"
title=
"Online"
></div>
jabber the hut
</li>
<div
class=
"occupant-status occupant-online circle"
title=
"Online"
></div>
jabber the hut
</li>
</ul>
</ul>
<div
class=
"chatroom-features"
>
<div
class=
"chatroom-features"
>
<p
class=
"occupants-heading"
>
Features
</p>
<p
class=
"occupants-heading"
>
Features
</p>
<ul
class=
"features-list"
>
<ul
class=
"features-list"
>
...
...
mockup/converse.html
View file @
b5a43f81
...
@@ -51,9 +51,8 @@
...
@@ -51,9 +51,8 @@
</span>
</span>
</div>
</div>
<div
class=
"chat-message"
>
<div
class=
"chat-message"
>
<span
class=
"chat-msg-author chat-msg-them"
>
19:25
<span
class=
"chat-msg-author chat-msg-them"
>
<canvas
height=
"24"
width=
"24"
class=
"avatar"
></canvas>
19:25
<canvas
height=
"24"
width=
"24"
class=
"avatar"
></canvas>
Benedict-John:
<span
class=
"chat-msg-them"
>
Benedict-John:
</span>
</span>
</span>
<span
class=
"chat-msg-content"
>
Dagsê
</span>
<span
class=
"chat-msg-content"
>
Dagsê
</span>
</div>
</div>
...
@@ -122,8 +121,7 @@
...
@@ -122,8 +121,7 @@
<a
class=
"chatbox-btn fa fa-close"
></a>
<a
class=
"chatbox-btn fa fa-close"
></a>
</div>
</div>
<div
class=
"chat-body chatroom-body"
>
<div
class=
"chat-body chatroom-body row no-gutters"
>
<div
class=
"row no-gutters"
>
<div
class=
"chat-area col-md-9 col-8"
>
<div
class=
"chat-area col-md-9 col-8"
>
<div
class=
"chat-content"
>
<div
class=
"chat-content"
>
<div
class=
"chat-message"
>
<div
class=
"chat-message"
>
...
@@ -190,7 +188,6 @@
...
@@ -190,7 +188,6 @@
<li
class=
"participant occupant"
title=
"Click to mention jabber the hut in your message."
>
<li
class=
"participant occupant"
title=
"Click to mention jabber the hut in your message."
>
<div
class=
"occupant-status occupant-online circle"
title=
"Online"
></div>
jabber the hut
</li>
<div
class=
"occupant-status occupant-online circle"
title=
"Online"
></div>
jabber the hut
</li>
</ul>
</ul>
<div
class=
"chatroom-features"
>
<div
class=
"chatroom-features"
>
<p
class=
"occupants-heading"
>
Features
</p>
<p
class=
"occupants-heading"
>
Features
</p>
<ul
class=
"features-list"
>
<ul
class=
"features-list"
>
...
@@ -206,7 +203,6 @@
...
@@ -206,7 +203,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
id=
"minimized-chats"
class=
"col col-1 w-100"
>
<div
id=
"minimized-chats"
class=
"col col-1 w-100"
>
<div
class=
"flyout minimized-chats-flyout row"
>
<div
class=
"flyout minimized-chats-flyout row"
>
...
...
sass/_chatbox.scss
View file @
b5a43f81
...
@@ -171,9 +171,6 @@
...
@@ -171,9 +171,6 @@
.chat-msg-author
{
.chat-msg-author
{
font-weight
:
bold
;
font-weight
:
bold
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
}
.chat-msg-them
{
.chat-msg-them
{
color
:
$message-them-color
;
color
:
$message-them-color
;
...
...
sass/_chatrooms.scss
View file @
b5a43f81
...
@@ -61,9 +61,7 @@
...
@@ -61,9 +61,7 @@
height
:
100vh
;
height
:
100vh
;
}
}
.chatroom-body
{
.chatroom-body
{
height
:
289px
;
@include
border-bottom-radius
(
$chatbox-border-radius
);
@include
border-bottom-radius
(
$chatbox-border-radius
);
@include
calc
(
height
,
'100% -
#{
$chat-head-height
}
'
);
background-color
:
white
;
background-color
:
white
;
border-top
:
0
;
border-top
:
0
;
width
:
100%
;
width
:
100%
;
...
@@ -103,8 +101,6 @@
...
@@ -103,8 +101,6 @@
.chat-area
{
.chat-area
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
min-width
:
$chat-width
;
min-width
:
$chat-width
;
height
:
calc
(
100%
-
95px
);
.new-msgs-indicator
{
.new-msgs-indicator
{
background-color
:
$chatroom-head-color
;
background-color
:
$chatroom-head-color
;
max-width
:
70%
;
max-width
:
70%
;
...
@@ -272,7 +268,6 @@
...
@@ -272,7 +268,6 @@
.box-flyout
{
.box-flyout
{
.chatroom-body
{
.chatroom-body
{
.chat-area
{
.chat-area
{
height
:
calc
(
100vh
-
55px
);
}
}
}
}
}
}
...
...
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