Skip to content

C
converse.js
Commit 463b0e6a authored by JC Brand's avatar JC Brand
Browse files
Options

Fix height for minimized chats toggle 

Also tweak progress indicator margin
parent 133df99a
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
css/converse.css
View file @ 463b0e6a
...@@ -6780,7 +6780,7 @@ body.reset { ...@@ -6780,7 +6780,7 @@ body.reset {
z-index: 1031; z-index: 1031;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
height: auto; height: 2.7rem;
right: 0; } right: 0; }
#conversejs ::-webkit-input-placeholder { #conversejs ::-webkit-input-placeholder {
/* Chrome/Opera/Safari */ /* Chrome/Opera/Safari */
...@@ -7345,12 +7345,14 @@ body.reset { ...@@ -7345,12 +7345,14 @@ body.reset {
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
padding: 5px; } padding: 5px; }
#converse-embedded-chat .chatbox .chat-body .message,
#conversejs .chatbox .chat-body .message {
margin: 0.5em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-info, #converse-embedded-chat .chatbox .chat-body .chat-info,
#conversejs .chatbox .chat-body .chat-info { #conversejs .chatbox .chat-body .chat-info {
line-height: 14px; line-height: 14px;
color: #3AA569; color: #3AA569;
font-size: 12px; font-size: 12px; }
margin: 0.5em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-info.badge, #converse-embedded-chat .chatbox .chat-body .chat-info.badge,
#conversejs .chatbox .chat-body .chat-info.badge { #conversejs .chatbox .chat-body .chat-info.badge {
color: white; } color: white; }
...@@ -7381,8 +7383,7 @@ body.reset { ...@@ -7381,8 +7383,7 @@ body.reset {
#converse-embedded-chat .chatbox .chat-body .chat-message, #converse-embedded-chat .chatbox .chat-body .chat-message,
#conversejs .chatbox .chat-body .chat-message { #conversejs .chatbox .chat-body .chat-message {
overflow: auto; overflow: auto;
margin: 0; margin: 0; }
padding: 0.4em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-message.onload, #converse-embedded-chat .chatbox .chat-body .chat-message.onload,
#conversejs .chatbox .chat-body .chat-message.onload { #conversejs .chatbox .chat-body .chat-message.onload {
animation: colorchange-chatmessage 1s; animation: colorchange-chatmessage 1s;
...@@ -7445,6 +7446,7 @@ body.reset { ...@@ -7445,6 +7446,7 @@ body.reset {
whitespace: nowrap; } whitespace: nowrap; }
#converse-embedded-chat .chatbox .chat-content progress, #converse-embedded-chat .chatbox .chat-content progress,
#conversejs .chatbox .chat-content progress { #conversejs .chatbox .chat-content progress {
margin: 0.5em 0;
width: 100%; } width: 100%; }
#converse-embedded-chat .chatbox .chat-content-sendbutton, #converse-embedded-chat .chatbox .chat-content-sendbutton,
#conversejs .chatbox .chat-content-sendbutton { #conversejs .chatbox .chat-content-sendbutton {
......
css/inverse.css
View file @ 463b0e6a
...@@ -6780,7 +6780,7 @@ body.reset { ...@@ -6780,7 +6780,7 @@ body.reset {
z-index: 1031; z-index: 1031;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
height: auto; height: 2.7rem;
right: 0; } right: 0; }
#conversejs ::-webkit-input-placeholder { #conversejs ::-webkit-input-placeholder {
/* Chrome/Opera/Safari */ /* Chrome/Opera/Safari */
...@@ -7398,12 +7398,14 @@ body { ...@@ -7398,12 +7398,14 @@ body {
font-size: 16px; font-size: 16px;
margin: 0; margin: 0;
padding: 5px; } padding: 5px; }
#converse-embedded-chat .chatbox .chat-body .message,
#conversejs .chatbox .chat-body .message {
margin: 0.5em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-info, #converse-embedded-chat .chatbox .chat-body .chat-info,
#conversejs .chatbox .chat-body .chat-info { #conversejs .chatbox .chat-body .chat-info {
line-height: 20px; line-height: 20px;
color: #3AA569; color: #3AA569;
font-size: 14px; font-size: 14px; }
margin: 0.5em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-info.badge, #converse-embedded-chat .chatbox .chat-body .chat-info.badge,
#conversejs .chatbox .chat-body .chat-info.badge { #conversejs .chatbox .chat-body .chat-info.badge {
color: white; } color: white; }
...@@ -7434,8 +7436,7 @@ body { ...@@ -7434,8 +7436,7 @@ body {
#converse-embedded-chat .chatbox .chat-body .chat-message, #converse-embedded-chat .chatbox .chat-body .chat-message,
#conversejs .chatbox .chat-body .chat-message { #conversejs .chatbox .chat-body .chat-message {
overflow: auto; overflow: auto;
margin: 0; margin: 0; }
padding: 0.4em 0; }
#converse-embedded-chat .chatbox .chat-body .chat-message.onload, #converse-embedded-chat .chatbox .chat-body .chat-message.onload,
#conversejs .chatbox .chat-body .chat-message.onload { #conversejs .chatbox .chat-body .chat-message.onload {
animation: colorchange-chatmessage 1s; animation: colorchange-chatmessage 1s;
...@@ -7498,6 +7499,7 @@ body { ...@@ -7498,6 +7499,7 @@ body {
whitespace: nowrap; } whitespace: nowrap; }
#converse-embedded-chat .chatbox .chat-content progress, #converse-embedded-chat .chatbox .chat-content progress,
#conversejs .chatbox .chat-content progress { #conversejs .chatbox .chat-content progress {
margin: 0.5em 0;
width: 100%; } width: 100%; }
#converse-embedded-chat .chatbox .chat-content-sendbutton, #converse-embedded-chat .chatbox .chat-content-sendbutton,
#conversejs .chatbox .chat-content-sendbutton { #conversejs .chatbox .chat-content-sendbutton {
......
sass/_chatbox.scss
View file @ 463b0e6a
...@@ -174,11 +174,13 @@ ...@@ -174,11 +174,13 @@
margin: 0; margin: 0;
padding: 5px; padding: 5px;
} }
.message {
margin: 0.5em 0;
}
.chat-info { .chat-info {
line-height: $line-height-small; line-height: $line-height-small;
color: $chat-head-color; color: $chat-head-color;
font-size: $font-size-small; font-size: $font-size-small;
margin: 0.5em 0;
&.badge { &.badge {
color: $chat-head-text-color; color: $chat-head-text-color;
} }
...@@ -210,7 +212,6 @@ ...@@ -210,7 +212,6 @@
.chat-message { .chat-message {
overflow: auto; // Ensures that content stays inside overflow: auto; // Ensures that content stays inside
margin: 0; margin: 0;
padding: 0.4em 0;
&.onload { &.onload {
animation: colorchange-chatmessage 1s; animation: colorchange-chatmessage 1s;
...@@ -282,6 +283,7 @@ ...@@ -282,6 +283,7 @@
} }
progress { progress {
margin: 0.5em 0;
width: 100% width: 100%
} }
} }
......
sass/_core.scss
View file @ 463b0e6a
...@@ -53,7 +53,7 @@ body.reset { ...@@ -53,7 +53,7 @@ body.reset {
z-index: 1031; // One more than bootstrap navbar z-index: 1031; // One more than bootstrap navbar
position: fixed; position: fixed;
bottom: 0; bottom: 0;
height: auto; height: 2.7rem;
right: 0; right: 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7