diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss index 44e6d3488..563f43edd 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss @@ -96,9 +96,9 @@ } .conversation-wrap { - @include background-gray; @include margin(0); @include border-normal-left; + background: var(--color-background-light); .current-chat { @include flex; @@ -140,8 +140,8 @@ flex-direction: column; // Firefox flexbox fix height: 100%; - margin-bottom: $space-small; overflow-y: auto; + padding-bottom: var(--space-normal); position: relative; } diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss index a234a110d..870a60c1b 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss @@ -1,28 +1,13 @@ .reply-box { - @include light-shadow; - border-bottom: 0; - border-radius: $space-small; - margin: $space-normal; - margin-top: 0; - max-height: $space-mega * 3; transition: box-shadow .35s $swift-ease-out-function, height 2s $swift-ease-out-function; &.is-focused { - @include shadow; + box-shadow: var(--shadow); } .reply-box__top { - @include flex; - @include flex-align($x: left, $y: middle); - @include padding($space-one $space-normal); - @include background-white; - @include margin(0); - border-top-left-radius: $space-small; - border-top-right-radius: $space-small; - position: relative; - .canned { @include elegant-card; background: $color-white; @@ -41,19 +26,6 @@ } } - &.is-active { - border-bottom-left-radius: $space-small; - border-bottom-right-radius: $space-small; - } - - &.is-private { - background: lighten($warning-color, 38%); - - >input { - background: lighten($warning-color, 38%); - } - } - .icon { color: $medium-gray; cursor: pointer; @@ -65,9 +37,6 @@ } } - .file-uploads>label { - cursor: pointer; - } .attachment { cursor: pointer; @@ -82,87 +51,45 @@ // Override min-height : 50px in foundation // max-height: $space-mega * 2.4; - min-height: 4rem; + min-height: 4.8rem; + padding: var(--space-normal) 0 0; resize: none; } } - .reply-box__bottom { - @include background-light; - @include flex; - @include flex-align($x: justify, $y: middle); - @include border-light-top; - border-bottom-left-radius: $space-small; - border-bottom-right-radius: $space-small; + &.is-private { + background: var(--y-50); - .tabs { - border: 0; - flex: 1; - padding: 0; + .reply-box__top { + background: var(--y-50); - .tabs-title { - margin: 0; - transition: all .2s $swift-ease-out-function; - transition-property: color, background; - - a { - font-weight: $font-weight-medium; - padding: $space-one $space-two; - } - - &.is-private.is-active { - background: lighten($warning-color, 38%); - - a { - border-bottom-color: darken($warning-color, 15%); - color: darken($warning-color, 15%); - } - } - } - - .tabs-title:first-child { - border-bottom-left-radius: $space-small; - - &.is-active { - @include border-light-right; - border-left: 0; - } - - a { - border-bottom-left-radius: $space-small; - } - } - - .is-active { - @include background-white; - @include border-light-left; - @include border-light-right; - margin-top: -1px; - } - - .message-length { - float: right; - - a { - font-size: $font-size-mini; - } - } - - .message-error { - color: $input-error-color; - } - } - - .send-button { - border-bottom-right-radius: $space-small; - height: 3.6rem; - padding-left: $space-two; - padding-right: $space-two; - padding-top: $space-small; - - .icon { - margin-left: $space-small; + >input { + background: var(--y-50); } } } + + .file-uploads>label { + cursor: pointer; + + &:hover .button--emoji { + background: var(--b-200); + } + } + + .bottom-box .button--emoji.button--upload { + height: var(--space-large); + padding: 0; + width: var(--space-large); + + .file-uploads { + height: 100%; + line-height: var(--space-large); + width: 100%; + } + + label { + padding: var(--space-small); + } + } } diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue index f8220db4d..84d6c7277 100644 --- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue +++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue @@ -66,7 +66,9 @@ export default { diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue new file mode 100644 index 000000000..390bf1160 --- /dev/null +++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/app/javascript/dashboard/components/widgets/WootWriter/constants.js b/app/javascript/dashboard/components/widgets/WootWriter/constants.js new file mode 100644 index 000000000..ef494d5ec --- /dev/null +++ b/app/javascript/dashboard/components/widgets/WootWriter/constants.js @@ -0,0 +1,4 @@ +export const REPLY_EDITOR_MODES = { + REPLY: 'REPLY', + NOTE: 'NOTE', +}; diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue index 8a59674d3..2c3e166c1 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue @@ -1,102 +1,61 @@ - diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss index f352d5530..7094ef67c 100644 --- a/app/javascript/shared/assets/stylesheets/colors.scss +++ b/app/javascript/shared/assets/stylesheets/colors.scss @@ -23,7 +23,7 @@ --g-800: #009000; --g-900: #007000; - --y-50: #FFFEE8; + --y-50: #FFFCF4; --y-100: #FFFAC5; --y-200: #FFF69E; --y-300: #FEF176; diff --git a/app/javascript/shared/components/emoji/EmojiInput.vue b/app/javascript/shared/components/emoji/EmojiInput.vue index 784eb8027..91a68b9a9 100644 --- a/app/javascript/shared/components/emoji/EmojiInput.vue +++ b/app/javascript/shared/components/emoji/EmojiInput.vue @@ -83,6 +83,7 @@ $font-size-medium: 18px; right: 0; top: -22 * $space-one; width: 32 * $space-one; + z-index: 1; &::before { @include arrow(bottom, $color-white, $space-slab);