Просмотр исходного кода

Fix height for minimized chats toggle

Also tweak progress indicator margin
JC Brand 7 лет назад
Родитель
Сommit
463b0e6abe
4 измененных файлов с 19 добавлено и 13 удалено
  1. 7 5
      css/converse.css
  2. 7 5
      css/inverse.css
  3. 4 2
      sass/_chatbox.scss
  4. 1 1
      sass/_core.scss

+ 7 - 5
css/converse.css

@@ -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 {
       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;
-      margin: 0.5em 0; }
+      font-size: 12px; }
       #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 {
     #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;
-      padding: 0.4em 0; }
+      margin: 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 {
       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 {

+ 7 - 5
css/inverse.css

@@ -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 {
       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;
-      margin: 0.5em 0; }
+      font-size: 14px; }
       #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 {
     #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;
-      padding: 0.4em 0; }
+      margin: 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 {
       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 {

+ 4 - 2
sass/_chatbox.scss

@@ -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 @@
             .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 @@
             }
             }
 
 
             progress {
             progress {
+                margin: 0.5em 0;
                 width: 100%
                 width: 100%
             }
             }
         }
         }

+ 1 - 1
sass/_core.scss

@@ -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;
     }
     }