From 62e9fc1bc5d9380128f365b67153360b37b7f789 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 1 Aug 2023 21:34:10 +0530 Subject: [PATCH] feat: update color palette [CW-2293] (#7617) --- .../assets/scss/_foundation-custom.scss | 1 + .../dashboard/assets/scss/_woot.scss | 1 - app/javascript/dashboard/assets/scss/app.scss | 5 + .../assets/scss/plugins/_multiselect.scss | 12 +- .../assets/scss/widgets/_buttons.scss | 22 +-- .../scss/widgets/_conversation-view.scss | 2 +- .../dashboard/assets/scss/widgets/_tabs.scss | 4 +- .../dashboard/components/ChatList.vue | 2 +- .../dashboard/components/SettingsSection.vue | 2 +- .../components/buttons/FormSubmitButton.vue | 8 +- .../sidebarComponents/AccountContext.vue | 8 +- .../sidebarComponents/NotificationBell.vue | 2 +- .../sidebarComponents/PrimaryNavItem.vue | 2 +- .../SecondaryChildNavItem.vue | 8 +- .../widgets/AutomationActionInput.vue | 4 +- .../components/widgets/ColorPicker.vue | 19 +- .../components/widgets/FilterInput/Index.vue | 15 +- .../components/widgets/WootWriter/Editor.vue | 25 +++ .../ConversationAdvancedFilter.vue | 2 +- .../widgets/conversation/ConversationCard.vue | 4 +- .../components/widgets/forms/PhoneInput.vue | 2 +- .../components/SearchResultContactItem.vue | 14 +- .../SearchResultConversationItem.vue | 7 +- .../routes/dashboard/commands/commandbar.vue | 13 +- .../components/ContactsAdvancedFilters.vue | 2 +- .../dashboard/contacts/components/Header.vue | 2 +- .../pages/articles/DefaultPortalArticles.vue | 6 +- .../pages/articles/ListAllArticles.vue | 26 +-- .../pages/portals/ListAllPortals.vue | 2 +- .../routes/dashboard/settings/Wrapper.vue | 2 +- .../dashboard/settings/account/Index.vue | 2 +- .../settings/attributes/CustomAttribute.vue | 5 +- .../dashboard/settings/macros/Index.vue | 2 +- .../dashboard/settings/macros/MacroNode.vue | 2 +- .../shared/components/emoji/EmojiInput.vue | 4 +- package.json | 4 +- tailwind.config.js | 164 ++++++++++-------- yarn.lock | 5 + 38 files changed, 241 insertions(+), 171 deletions(-) diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss index c5470e4e9..8230d1f45 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss @@ -26,6 +26,7 @@ code { background: $color-background; border-radius: var(--border-radius-large); padding: $space-two; + @apply bg-slate-50 dark:bg-slate-600 text-slate-800 dark:text-slate-100; } } diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss index 2bf085024..2773ced6f 100644 --- a/app/javascript/dashboard/assets/scss/_woot.scss +++ b/app/javascript/dashboard/assets/scss/_woot.scss @@ -72,7 +72,6 @@ @import '~shared/assets/stylesheets/ionicons'; @import 'utility-helpers'; - .tooltip { @apply bg-slate-900 text-white py-1 px-2 z-40 text-xs rounded-md dark:bg-slate-200 dark:text-slate-900; } diff --git a/app/javascript/dashboard/assets/scss/app.scss b/app/javascript/dashboard/assets/scss/app.scss index 13c3dd557..4a86dbc5a 100644 --- a/app/javascript/dashboard/assets/scss/app.scss +++ b/app/javascript/dashboard/assets/scss/app.scss @@ -1 +1,6 @@ +// scss-lint:disable PropertySpelling +:root { + color-scheme: light dark; +} + @import 'woot'; diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss index 0d2317edd..fbeecbc5e 100644 --- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss +++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss @@ -18,7 +18,15 @@ } &.multiselect--disabled { - @apply opacity-80; + @apply opacity-50 border border-slate-200 dark:border-slate-600 rounded-md cursor-not-allowed; + + .multiselect__select { + @apply cursor-not-allowed bg-white dark:bg-slate-900 rounded-md; + } + + .multiselect__tags { + @apply border-0; + } } .multiselect--active { @@ -36,7 +44,7 @@ } .multiselect__content-wrapper { - @apply bg-white dark:bg-slate-900 border border-slate-200 dark:border-slate-600 text-slate-800 dark:text-slate-100; + @apply bg-white dark:bg-slate-900 border border-solid border-slate-200 dark:border-slate-600 text-slate-800 dark:text-slate-100; } .multiselect__content { diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss index 56d8d44c6..686f97372 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss @@ -49,7 +49,7 @@ } &.success { - @apply text-green-700 dark:text-green-100 hover:bg-green-50 dark:hover:bg-green-800; + @apply text-green-700 dark:text-green-100 hover:bg-green-50 dark:hover:bg-green-800 ; } &.alert { @@ -64,19 +64,19 @@ @apply bg-slate-75 dark:bg-slate-900 border-slate-100 dark:border-slate-700; &.secondary { - @apply border-slate-100 dark:border-slate-700; + @apply border-slate-100 dark:border-slate-700 text-slate-800 dark:text-slate-100; } &.success { - @apply border-slate-100 dark:border-slate-700; + @apply border-slate-100 dark:border-slate-700 text-green-800 dark:text-green-100; } &.alert { - @apply border-slate-100 dark:border-slate-700; + @apply border-slate-100 dark:border-slate-700 text-red-700 dark:text-red-100; } &.warning { - @apply border-slate-100 dark:border-slate-700; + @apply border-slate-100 dark:border-slate-700 text-yellow-700 dark:text-yellow-700; } } } @@ -90,7 +90,7 @@ } &.success { - @apply bg-green-50 dark:bg-green-700 text-green-700 dark:text-green-100 hover:bg-green-100 dark:hover:bg-green-800; + @apply bg-green-50 dark:bg-green-700 text-green-700 dark:text-green-100 hover:bg-green-100 dark:hover:bg-green-800 hover:text-green-800 dark:hover:text-green-100; } &.alert { @@ -110,7 +110,7 @@ } &.success { - @apply text-green-700 dark:text-green-100; + @apply text-green-700 dark:text-green-100 ; } &.alert { @@ -125,19 +125,19 @@ @apply hover:bg-woot-50 dark:hover:bg-woot-900/50 hover:text-woot-500 dark:hover:text-woot-100; &.secondary { - @apply hover:bg-slate-50 dark:hover:bg-slate-700; + @apply hover:bg-slate-50 dark:hover:bg-slate-700 text-slate-800 dark:text-slate-100; } &.success { - @apply hover:bg-green-50 dark:hover:bg-green-800; + @apply hover:bg-green-50 dark:hover:bg-green-800 text-green-800 dark:text-green-100; } &.alert { - @apply hover:bg-red-50 dark:hover:bg-red-800; + @apply hover:bg-red-50 dark:hover:bg-red-800 text-red-700 dark:text-red-100; } &.warning { - @apply hover:bg-yellow-50 dark:hover:bg-yellow-100; + @apply hover:bg-yellow-50 dark:hover:bg-yellow-100 text-yellow-700 dark:text-yellow-700; } } diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss index ceca3a8e9..b107ec226 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss @@ -129,7 +129,7 @@ @apply ml-auto break-words rounded-l-lg rounded-r; &.is-private { - @apply text-black-900 dark:text-black-900 relative border border-solid bg-[#fff3d5] border-[#ffd97a] dark:bg-[#fff3d5] dark:border-[#ffd97a]; + @apply text-black-900 dark:text-black-900 relative border border-solid bg-yellow-100 border-yellow-200 dark:bg-yellow-300/70 dark:border-0; } &.is-image { diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss index 8ba9b6c94..35a9ee9ed 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss @@ -31,7 +31,7 @@ } .tabs-title { - @apply flex-shrink-0 my-0 mx-2; + @apply flex-shrink-0 my-0 mx-2 ; .badge { @apply bg-slate-50 dark:bg-slate-800 rounded-md text-slate-600 dark:text-slate-100 h-5 flex items-center justify-center text-xxs font-semibold my-0 mx-1 px-1 py-0; @@ -53,7 +53,7 @@ } a { - @apply flex items-center flex-row border-b border-transparent text-slate-600 dark:text-slate-200 text-sm top-[1px] relative; + @apply flex items-center flex-row border-b border-transparent text-slate-500 dark:text-slate-200 text-sm top-[1px] relative; transition: border-color 0.15s $swift-ease-out-function; } diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index ce58aca09..7acf13a31 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -15,7 +15,7 @@ >

{{ pageTitle }} diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue index 59f9a3387..9fc6e88f2 100644 --- a/app/javascript/dashboard/components/SettingsSection.vue +++ b/app/javascript/dashboard/components/SettingsSection.vue @@ -2,7 +2,7 @@
diff --git a/app/javascript/dashboard/components/buttons/FormSubmitButton.vue b/app/javascript/dashboard/components/buttons/FormSubmitButton.vue index 05defdf4f..fd5612001 100644 --- a/app/javascript/dashboard/components/buttons/FormSubmitButton.vue +++ b/app/javascript/dashboard/components/buttons/FormSubmitButton.vue @@ -51,7 +51,7 @@ export default { }, computed: { computedClass() { - return `button nice ${this.buttonClass || ' '}`; + return `button nice gap-2 ${this.buttonClass || ' '}`; }, }, methods: { @@ -63,11 +63,9 @@ export default { diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue index 6d02148d8..ec0d986c2 100644 --- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue +++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue @@ -1,7 +1,7 @@