diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss index c0d6b1bb6..0ed06c914 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss @@ -42,7 +42,6 @@ $resolve-button-width: 13.2rem; margin-right: var(--space-normal); min-width: 0; - .user--profile__meta { align-items: flex-start; display: flex; @@ -54,13 +53,17 @@ $resolve-button-width: 13.2rem; } } - .header-actions-wrap { align-items: center; display: flex; flex-direction: row; flex-grow: 1; justify-content: flex-end; + margin-top: var(--space-small); + + @include breakpoint(medium up) { + margin-top: 0; + } &.has-open-sidebar { justify-content: flex-end; diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss index b67932e6d..55135da2d 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss @@ -324,6 +324,7 @@ var(--space-one); .is-text { + align-items: center; display: inline-flex; text-align: start; diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index a957ff78b..7d4a9239e 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -794,30 +794,15 @@ export default { .conversations-list-wrap { flex-shrink: 0; - width: 34rem; + flex-basis: clamp(32rem, 4vw + 34rem, 44rem); overflow: hidden; - @include breakpoint(large up) { - width: 36rem; - } - @include breakpoint(xlarge up) { - width: 35rem; - } - @include breakpoint(xxlarge up) { - width: 38rem; - } - @include breakpoint(xxxlarge up) { - flex-basis: 46rem; - } &.hide { display: none; } &.list--full-width { - width: 100%; - @include breakpoint(xxxlarge up) { - flex-basis: 100%; - } + flex-basis: 100%; } } .filter--actions { diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue index b919be2cd..24b289bab 100644 --- a/app/javascript/dashboard/components/layout/Sidebar.vue +++ b/app/javascript/dashboard/components/layout/Sidebar.vue @@ -233,9 +233,6 @@ export default { width: 40rem; } } -.off-canvas-content.is-open-left { - transform: translateX(18.8rem); -} .secondary-sidebar { overflow-y: auto; diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue index b6614dcc0..5552f9149 100644 --- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue +++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue @@ -376,6 +376,10 @@ export default { display: flex; flex-direction: column; + .ProseMirror-menubar { + min-height: var(--space-two) !important; + } + > .ProseMirror { padding: 0; word-break: break-word; diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue index a8ad8e36c..0ed8c84d5 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue @@ -166,10 +166,14 @@ export default { .conversation-sidebar-wrap { height: auto; flex: 0 0; - overflow: hidden; + z-index: var(--z-index-low); overflow: auto; background: white; - flex-basis: 28rem; + flex-basis: 100%; + + @include breakpoint(medium up) { + flex-basis: 28rem; + } @include breakpoint(large up) { flex-basis: 30em; diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue index 666072ef2..6bcd9a790 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue @@ -1,53 +1,54 @@ @@ -165,14 +166,27 @@ export default {