5 files changed, 91 insertions, 56 deletions

diff --git a/src/_layouts.scss b/src/_layouts.scss
index cc8b1c5..26cfe3f 100644
--- a/src/_layouts.scss
+++ b/src/_layouts.scss
@@ -4,4 +4,4 @@
 @use 'layouts/form';
 @use 'layouts/flex';
 @use 'layouts/overflow';
-@use 'layouts/bubble-group';
+@use 'layouts/message-group';
diff --git a/src/_objects.scss b/src/_objects.scss
index faa45bd..578de0c 100644
--- a/src/_objects.scss
+++ b/src/_objects.scss
@@ -13,7 +13,7 @@
 @use 'objects/overflow-button';
 @use 'objects/status-indicator';
 @use 'objects/avatar';
-@use 'objects/bubble';
+@use 'objects/message';
 @use 'objects/action-menu';
 @use 'objects/menu';
 @use 'objects/icon-nav';
diff --git a/src/layouts/_bubble-group.scss b/src/layouts/_message-group.scss
index e4bc666..d95c9e8 100644
--- a/src/layouts/_bubble-group.scss
+++ b/src/layouts/_message-group.scss
@@ -1,7 +1,9 @@
 @use 'iro-sass/src/index' as iro;
 @use '../functions' as fn;
 
-@include iro.props-namespace('bubble-group') {
+@use '../objects/message';
+
+@include iro.props-namespace('message-group') {
     @include iro.props-store((
         --dims: (
             --spacing-x:  fn.global-dim(--size --225),
@@ -19,16 +21,17 @@
         display:               grid;
         grid-template-columns: auto 1fr;
         grid-auto-rows:        auto;
-        grid-template-areas:   'avatar bubble' 'avatar .';
+        grid-template-areas:   'avatar message' 'avatar .';
         align-items:           flex-start;
         gap:                   0 fn.dim(--spacing-x);
         
         @include iro.bem-elem('avatar') {
             grid-area: avatar;
+            height:    0;
         }
         
-        @include iro.bem-elem('bubble') {
-            grid-column: bubble;
+        @include iro.bem-elem('message') {
+            grid-column: message;
             box-sizing:  border-box;
             min-width:   0;
             max-width:   100%;
@@ -50,7 +53,7 @@
         }
         
         @include iro.bem-modifier('right') {
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 &::before {
                     right:              calc(-1 * fn.dim(--arrow-size));
                     left:               auto;
@@ -71,7 +74,7 @@
                 justify-items: end;
             }
         
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 @include iro.bem-next-twin-elem {
                     margin-top: fn.dim(--compact --spacing-y);
                 }
@@ -80,12 +83,12 @@
         
         @include iro.bem-modifier('right') {
             grid-template-columns: 1fr auto;
-            grid-template-areas:   'bubble avatar' '. avatar';
+            grid-template-areas:   'message avatar' '. avatar';
         }
         
         @include iro.bem-modifier('no-avatar') {
             grid-template-columns: 1fr;
-            grid-template-areas:   'bubble';
+            grid-template-areas:   'message';
 
             @include iro.bem-elem('avatar') {
                 display: none;
@@ -93,7 +96,7 @@
         }
         
         @include iro.bem-modifier('arrow') {
-            @include iro.bem-elem('bubble') {
+            @include iro.bem-elem('message') {
                 &::before {
                     display: block;
                 }
@@ -105,5 +108,31 @@
                 }
             }
         }
+        
+        & + & {
+            @include iro.bem-modifier('merge') {
+                margin-top: fn.dim(--spacing-y);
+
+                @include iro.bem-elem('avatar') {
+                    visibility: hidden;
+                }
+
+                @include iro.bem-modifier('compact') {
+                    margin-top: fn.dim(--compact --spacing-y);
+                }
+
+                @include iro.bem-elem('merge-hide') {
+                    display: none;
+                }
+        
+                @include iro.bem-modifier('arrow') {
+                    @include iro.bem-elem('message') {
+                        &::before {
+                            display: none;
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/src/objects/_bubble.scss b/src/objects/_bubble.scss
deleted file mode 100644
index d91b6d1..0000000
--- a/src/objects/_bubble.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-@use 'iro-sass/src/index' as iro;
-@use '../functions' as fn;
-
-@include iro.props-namespace('bubble') {
-    @include iro.props-store((
-        --dims: (
-            --pad-x:    fn.global-dim(--size --200),
-            --pad-y:    fn.global-dim(--size --150),
-            --rounding: 0,
-
-            --75: (
-                --pad-x: fn.global-dim(--size --150),
-                --pad-y: fn.global-dim(--size --85),
-            ),
-        )
-    ), 'dims');
-
-    @include iro.props-store((
-        --colors: (
-            --highlight: fn.global-color(--fg-lo),
-        ),
-    ), 'colors');
-
-    @include iro.bem-object(iro.props-namespace()) {
-        position:         relative;
-        padding:          fn.dim(--pad-y) fn.dim(--pad-x);
-        border-radius:    fn.dim(--rounding);
-        background-color: fn.global-color(--bg);
-        color:            fn.global-color(--fg);
-
-        @include iro.bem-modifier('highlight') {
-            box-shadow: -3px 0 0 0 fn.color(--highlight);
-        }
-        
-        @include iro.bem-elem('suffix') {
-            margin-left: 1em;
-            float:       right;
-            transform:   translate(.2em, .2em);
-        }
-        
-        @include iro.bem-modifier('75') {
-            padding: fn.dim(--75 --pad-y) fn.dim(--75 --pad-x);
-        }
-    }
-}
diff --git a/src/objects/_message.scss b/src/objects/_message.scss
new file mode 100644
index 0000000..283ce26
--- /dev/null
+++ b/src/objects/_message.scss
@@ -0,0 +1,51 @@
+@use 'iro-sass/src/index' as iro;
+@use '../functions' as fn;
+
+@include iro.props-namespace('message') {
+    @include iro.props-store((
+        --dims: (
+            --bubble: (
+                --pad-x:    fn.global-dim(--size --200),
+                --pad-y:    fn.global-dim(--size --150),
+                --rounding: 0,
+
+                --75: (
+                    --pad-x: fn.global-dim(--size --150),
+                    --pad-y: fn.global-dim(--size --85),
+                ),
+            ),
+        )
+    ), 'dims');
+
+    @include iro.props-store((
+        --colors: (
+            --highlight: fn.global-color(--fg-lo),
+        ),
+    ), 'colors');
+
+    @include iro.bem-object(iro.props-namespace()) {
+        @include iro.bem-elem('suffix') {
+            margin-left: 1em;
+            float:       right;
+        }
+        
+        @include iro.bem-modifier('bubble') {
+            padding:          fn.dim(--bubble --pad-y) fn.dim(--bubble --pad-x);
+            border-radius:    fn.dim(--bubble --rounding);
+            background-color: fn.global-color(--bg);
+            color:            fn.global-color(--fg);
+        
+            @include iro.bem-elem('suffix') {
+                transform: translate(.2em, .2em);
+            }
+
+            @include iro.bem-modifier('highlight') {
+                box-shadow: -3px 0 0 0 fn.color(--highlight);
+            }
+        
+            @include iro.bem-modifier('75') {
+                padding: fn.dim(--bubble --75 --pad-y) fn.dim(--bubble --75 --pad-x);
+            }
+        }
+    }
+}