diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss index e330c8503..8b31295c3 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss @@ -456,12 +456,12 @@ $meter-fill-bad: $alert-color; // -------------- $offcanvas-sizes: ( - small: 250px, - medium: 350px, + small: 23rem, + medium: 23rem, ); $offcanvas-vertical-sizes: ( - small: 250px, - medium: 350px, + small: 23rem, + medium: 23rem, ); $offcanvas-background: $light-gray; $offcanvas-shadow: 0 0 10px rgba($black, 0.7); diff --git a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss index cdcf512b5..df2af2441 100644 --- a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss +++ b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss @@ -17,9 +17,6 @@ @include flex; @include flex-align($x: center, $y: middle); @include margin($zero); - > span { - @include padding($zero $space-small $zero $space-small); - } } } diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss index dc511865f..5e5cd87fa 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss @@ -3,9 +3,14 @@ flex-direction: column; .chat-list__top { + @include flex; @include padding($space-normal $zero $space-small $zero); + + align-items: center; + justify-content: space-between; + .page-title { - float: left; + @include flex; margin-bottom: $zero; margin-left: $space-normal; } diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss index 12602cd37..80807d099 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss @@ -126,3 +126,22 @@ margin-top: auto; } } + +.hamburger--menu { + cursor: pointer; + display: none; + margin-right: $space-normal; + + @media screen and (max-width: 1200px){ + display: block; + } +} + +.header--icon { + display: block; + margin-right: $space-normal; + + @media screen and (max-width: 1200px){ + display: none; + } +} diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 89106b915..2c6f4716d 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -2,6 +2,7 @@