浏览代码

Fix gutters between chats.

Looks like this also fixes #3413
JC Brand 11 月之前
父节点
当前提交
c5848defe0

+ 7 - 12
src/plugins/chatboxviews/styles/chats.scss

@@ -1,28 +1,23 @@
 .conversejs {
 .conversejs {
     converse-chats {
     converse-chats {
-        &.converse-chatboxes {
-            z-index: 1031; // One more than bootstrap navbar
-            position: fixed;
-            bottom: 0;
-            right: 0;
-            left: 1em;
-        }
         &.converse-overlayed {
         &.converse-overlayed {
             > .row {
             > .row {
                 flex-direction: row-reverse;
                 flex-direction: row-reverse;
             }
             }
+            &.converse-chatboxes {
+                z-index: 1031; // One more than bootstrap navbar
+                position: fixed;
+                bottom: 0;
+                right: 0;
+                left: 1em;
+            }
         }
         }
 
 
         &.converse-fullscreen,
         &.converse-fullscreen,
         &.converse-mobile {
         &.converse-mobile {
             flex-wrap: nowrap;
             flex-wrap: nowrap;
-            width: 100vw;
         }
         }
         &.converse-embedded {
         &.converse-embedded {
-            box-sizing: border-box;
-            *, *:before, *:after {
-                box-sizing: border-box;
-            }
             bottom: auto;
             bottom: auto;
             height: 100%; // When embedded, it fills the containing element
             height: 100%; // When embedded, it fills the containing element
             position: relative;
             position: relative;

+ 10 - 1
src/plugins/chatview/styles/chatbox.scss

@@ -1,7 +1,16 @@
+.conversejs {
+    converse-chats {
+        &.converse-overlayed {
+            .chatbox {
+                margin: 0 var(--overlayed-chat-gutter);
+            }
+        }
+    }
+}
+
 .conversejs {
 .conversejs {
     .chatbox {
     .chatbox {
         text-align: left;
         text-align: left;
-        margin: 0 var(--chat-gutter);
 
 
         @media screen and (max-height: $mobile-landscape-height) {
         @media screen and (max-height: $mobile-landscape-height) {
             margin: 0;
             margin: 0;

+ 3 - 3
src/plugins/chatview/styles/index.scss

@@ -113,13 +113,13 @@
                 &:not(#controlbox) {
                 &:not(#controlbox) {
                     .box-flyout {
                     .box-flyout {
                         @include media-breakpoint-up(md) {
                         @include media-breakpoint-up(md) {
-                            max-width: 66.666667%;
+                            @include make-col(8);
                         }
                         }
                         @include media-breakpoint-up(lg) {
                         @include media-breakpoint-up(lg) {
-                            max-width: 75%;
+                            @include make-col(9);
                         }
                         }
                         @include media-breakpoint-up(xl) {
                         @include media-breakpoint-up(xl) {
-                            max-width: 83.333333%;
+                            @include make-col(10);
                         }
                         }
                     }
                     }
                 }
                 }

+ 5 - 15
src/plugins/controlbox/styles/_controlbox.scss

@@ -82,8 +82,6 @@
             background-color: var(--controlbox-pane-background-color);
             background-color: var(--controlbox-pane-background-color);
         }
         }
 
 
-        margin-right: calc(3 * var(--chat-gutter));
-
         &.logged-out {
         &.logged-out {
             .box-flyout {
             .box-flyout {
                 .controlbox-pane {
                 .controlbox-pane {
@@ -329,25 +327,19 @@
                 text-align: center;
                 text-align: center;
                 background-color: var(--controlbox-head-color);
                 background-color: var(--controlbox-head-color);
                 float: right;
                 float: right;
-                margin: 0 var(--chat-gutter);
+                margin: 0 var(--overlayed-chat-gutter);
             }
             }
 
 
             #controlbox {
             #controlbox {
                 order: -1;
                 order: -1;
                 min-width: var(--controlbox-width) !important;
                 min-width: var(--controlbox-width) !important;
                 width: var(--controlbox-width);
                 width: var(--controlbox-width);
+
                 .box-flyout {
                 .box-flyout {
                     min-width: var(--controlbox-width) !important;
                     min-width: var(--controlbox-width) !important;
                     width: var(--controlbox-width);
                     width: var(--controlbox-width);
                 }
                 }
 
 
-                @media screen and (max-width: $mobile-portrait-length) {
-                    margin-left: -15px;
-                }
-                @include media-breakpoint-down(sm) {
-                    margin-left: -15px;
-                }
-
                 .login-trusted {
                 .login-trusted {
                     white-space: nowrap;
                     white-space: nowrap;
                     font-size: 90%;
                     font-size: 90%;
@@ -510,7 +502,6 @@
 
 
         &.converse-fullscreen {
         &.converse-fullscreen {
             #controlbox {
             #controlbox {
-                margin-left: -15px;
                 @media screen and (max-width: $mobile-portrait-length) {
                 @media screen and (max-width: $mobile-portrait-length) {
                     margin-left: 0;
                     margin-left: 0;
                 }
                 }
@@ -519,13 +510,13 @@
                 }
                 }
                 .box-flyout {
                 .box-flyout {
                     @include media-breakpoint-up(md) {
                     @include media-breakpoint-up(md) {
-                        max-width: 33.333333%;
+                        @include make-col(4);
                     }
                     }
                     @include media-breakpoint-up(lg) {
                     @include media-breakpoint-up(lg) {
-                        max-width: 25%;
+                        @include make-col(3);
                     }
                     }
                     @include media-breakpoint-up(xl) {
                     @include media-breakpoint-up(xl) {
-                        max-width: 17.666667%;
+                        @include make-col(2);
                     }
                     }
                 }
                 }
             }
             }
@@ -570,7 +561,6 @@
                 .box-flyout {
                 .box-flyout {
                     width: 100vw !important;
                     width: 100vw !important;
                     height: var(--fullpage-chat-height);
                     height: var(--fullpage-chat-height);
-                    margin-right: -15px;
                 }
                 }
                 .sidebar {
                 .sidebar {
                     display: block;
                     display: block;

+ 1 - 0
src/plugins/rootview/root.js

@@ -32,6 +32,7 @@ export default class ConverseRoot extends CustomElement {
     setClasses () {
     setClasses () {
         this.className = "";
         this.className = "";
         this.classList.add('container-fluid');
         this.classList.add('container-fluid');
+        this.classList.add('g-0');
         this.classList.add('conversejs');
         this.classList.add('conversejs');
         this.classList.add(`converse-${api.settings.get('view_mode')}`);
         this.classList.add(`converse-${api.settings.get('view_mode')}`);
         this.classList.add(`theme-${getTheme()}`);
         this.classList.add(`theme-${getTheme()}`);

+ 1 - 2
src/shared/styles/_variables.scss

@@ -37,14 +37,13 @@ $mobile_portrait_length: 480px !default;
 
 
     --embedded-emoji-picker-height: 300px;
     --embedded-emoji-picker-height: 300px;
 
 
-    --chat-gutter: 1em;
-
     --occupants-padding: 1em;
     --occupants-padding: 1em;
 
 
     --minimized-chats-width: 130px;
     --minimized-chats-width: 130px;
     --mobile-chat-width: 100%;
     --mobile-chat-width: 100%;
     --mobile-chat-height: 400px;
     --mobile-chat-height: 400px;
 
 
+    --overlayed-chat-gutter: 1em;
     --overlayed-chat-head-height: 55px;
     --overlayed-chat-head-height: 55px;
     --overlayed-chat-height: 450px;
     --overlayed-chat-height: 450px;
     --overlayed-chat-width: 300px;
     --overlayed-chat-width: 300px;