From c792cfc0be499365917a7fa35414ebb57d4f071a Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Tue, 30 Nov 2021 21:03:18 -0800 Subject: [PATCH] feat: Use Fluent SVG icons on the dashboard (#3482) --- .../assets/scss/_utility-helpers.scss | 4 + .../scss/widgets/_conversation-card.scss | 5 -- .../dashboard/assets/scss/widgets/_modal.scss | 2 +- .../assets/scss/widgets/_sidemenu.scss | 14 +-- .../components/Accordion/AccordionItem.vue | 4 +- .../dashboard/components/ChatList.vue | 2 +- .../dashboard/components/CustomAttribute.vue | 8 +- app/javascript/dashboard/components/Modal.vue | 4 +- .../components/NetworkNotification.vue | 2 +- .../dashboard/components/SidemenuIcon.vue | 16 +++- .../dashboard/components/buttons/Button.vue | 5 +- .../components/buttons/FormSubmitButton.vue | 2 +- .../components/buttons/ResolveAction.vue | 12 ++- .../dashboard/components/layout/Sidebar.vue | 26 +++--- .../components/layout/SidebarItem.vue | 27 +++--- .../sidebarComponents/AccountSelector.vue | 8 +- .../sidebarComponents/AddAccountModal.vue | 13 +-- .../sidebarComponents/NotificationBell.vue | 4 +- .../specs/AccountSelector.spec.js | 4 +- .../__snapshots__/SidemenuIcon.spec.js.snap | 9 +- .../dashboard/components/ui/Label.vue | 25 +++++- .../dashboard/components/ui/Wizard.vue | 2 +- .../dashboard/components/ui/WootButton.vue | 5 ++ .../components/widgets/AttachmentsPreview.vue | 9 +- .../components/widgets/BackButton.vue | 6 +- .../components/widgets/InboxIconWithName.vue | 38 --------- .../components/widgets/InboxListItem.vue | 23 ----- .../components/widgets/InboxName.vue | 11 ++- .../components/widgets/SearchBox.vue | 11 --- .../components/widgets/TableFooter.vue | 20 +++-- .../widgets/WootWriter/ReplyBottomPanel.vue | 11 ++- .../widgets/WootWriter/ReplyTopPanel.vue | 4 +- .../ConversationAdvancedFilter.vue | 3 +- .../widgets/conversation/ConversationCard.vue | 69 +++++++++++---- .../conversation/ConversationHeader.vue | 6 +- .../widgets/conversation/Message.vue | 6 +- .../widgets/conversation/MessagesView.vue | 6 +- .../widgets/conversation/MoreActions.vue | 6 +- .../widgets/conversation/bubble/Actions.vue | 49 ++++++----- .../widgets/conversation/bubble/File.vue | 2 +- .../widgets/conversation/bubble/Text.vue | 8 +- .../conversation/components/FilterInput.vue | 3 +- .../widgets/modal/WootKeyShortcutModal.vue | 8 +- app/javascript/dashboard/helper/inbox.js | 23 ++--- .../dashboard/helper/specs/inbox.spec.js | 16 ++-- .../dashboard/i18n/locale/ar/chatlist.json | 6 -- .../dashboard/i18n/locale/ca/chatlist.json | 6 -- .../dashboard/i18n/locale/cs/chatlist.json | 6 -- .../dashboard/i18n/locale/da/chatlist.json | 6 -- .../dashboard/i18n/locale/de/chatlist.json | 6 -- .../dashboard/i18n/locale/el/chatlist.json | 6 -- .../dashboard/i18n/locale/en/chatlist.json | 6 -- .../dashboard/i18n/locale/es/chatlist.json | 6 -- .../dashboard/i18n/locale/fa/chatlist.json | 6 -- .../dashboard/i18n/locale/fi/chatlist.json | 6 -- .../dashboard/i18n/locale/fr/chatlist.json | 6 -- .../dashboard/i18n/locale/he/chatlist.json | 6 -- .../dashboard/i18n/locale/hi/chatlist.json | 6 -- .../dashboard/i18n/locale/hu/chatlist.json | 6 -- .../dashboard/i18n/locale/id/chatlist.json | 6 -- .../dashboard/i18n/locale/it/chatlist.json | 6 -- .../dashboard/i18n/locale/ja/chatlist.json | 6 -- .../dashboard/i18n/locale/ko/chatlist.json | 6 -- .../dashboard/i18n/locale/ml/chatlist.json | 6 -- .../dashboard/i18n/locale/ne/chatlist.json | 6 -- .../dashboard/i18n/locale/nl/chatlist.json | 6 -- .../dashboard/i18n/locale/no/chatlist.json | 6 -- .../dashboard/i18n/locale/pl/chatlist.json | 6 -- .../dashboard/i18n/locale/pt/chatlist.json | 6 -- .../dashboard/i18n/locale/pt_BR/chatlist.json | 6 -- .../dashboard/i18n/locale/ru/chatlist.json | 6 -- .../dashboard/i18n/locale/sk/chatlist.json | 6 -- .../dashboard/i18n/locale/sv/chatlist.json | 6 -- .../dashboard/i18n/locale/ta/chatlist.json | 6 -- .../dashboard/i18n/locale/th/chatlist.json | 6 -- .../dashboard/i18n/locale/tr/chatlist.json | 6 -- .../dashboard/i18n/locale/uk/chatlist.json | 6 -- .../dashboard/i18n/locale/vi/chatlist.json | 6 -- .../dashboard/i18n/locale/zh/chatlist.json | 6 -- .../dashboard/i18n/locale/zh_CN/chatlist.json | 6 -- .../dashboard/i18n/locale/zh_TW/chatlist.json | 6 -- .../dashboard/i18n/sidebarItems/campaigns.js | 6 +- .../dashboard/i18n/sidebarItems/common.js | 12 +-- .../dashboard/i18n/sidebarItems/contacts.js | 4 +- .../dashboard/i18n/sidebarItems/reports.js | 14 +-- .../dashboard/i18n/sidebarItems/settings.js | 22 ++--- .../mixins/specs/attributeFixtures.js | 2 +- .../mixins/specs/attributeMixin.spec.js | 2 +- .../contact/components/ContactAttribute.vue | 2 +- .../components/ContactDropdownItem.vue | 10 ++- .../contact/components/ContactFields.vue | 14 +-- .../contact/components/ContactIntro.vue | 2 +- .../contact/components/MergeContact.vue | 6 +- .../components/MessageContextMenu.vue | 9 +- .../modules/notes/components/ContactNote.vue | 3 +- .../contacts/components/ContactInfoPanel.vue | 2 +- .../contacts/components/ContactsTable.vue | 3 +- .../dashboard/contacts/components/Header.vue | 6 +- .../contacts/components/ReminderItem.vue | 2 +- .../dashboard/conversation/ContactPanel.vue | 10 ++- .../conversation/ConversationAction.vue | 3 +- .../conversation/contact/ContactInfo.vue | 23 +++-- .../conversation/contact/ContactInfoRow.vue | 9 +- .../conversation/contact/SocialIcons.vue | 6 +- .../CustomAttributeDropDown.vue | 2 +- .../CustomAttributeSelector.vue | 2 +- .../conversation/search/PopOverSearch.vue | 2 +- .../conversation/search/ResultItem.vue | 12 +-- .../conversation/search/SearchMessageItem.vue | 11 ++- .../routes/dashboard/notifications/routes.js | 2 +- .../dashboard/settings/SettingsHeader.vue | 4 +- .../settings/account/account.routes.js | 2 +- .../dashboard/settings/agents/EditAgent.vue | 2 +- .../dashboard/settings/agents/Index.vue | 6 +- .../dashboard/settings/agents/agent.routes.js | 2 +- .../settings/attributes/CustomAttribute.vue | 4 +- .../dashboard/settings/attributes/Index.vue | 2 +- .../settings/attributes/attributes.routes.js | 2 +- .../dashboard/settings/automation/Index.vue | 2 +- .../settings/automation/automation.routes.js | 2 +- .../settings/campaigns/CampaignsTable.vue | 10 +-- .../dashboard/settings/campaigns/Index.vue | 2 +- .../settings/campaigns/campaigns.routes.js | 4 +- .../dashboard/settings/canned/Index.vue | 6 +- .../settings/canned/canned.routes.js | 2 +- .../routes/dashboard/settings/inbox/Index.vue | 4 +- .../settings/inbox/channels/Twitter.vue | 2 +- .../settings/inbox/components/BusinessDay.vue | 2 +- .../dashboard/settings/inbox/inbox.routes.js | 2 +- .../integrationapps/IntegrationHooks.vue | 2 +- .../integrationapps/IntegrationItem.vue | 2 +- .../MultipleIntegrationHooks.vue | 2 +- .../integrationapps/integrations.routes.js | 2 +- .../settings/integrations/Integration.vue | 2 +- .../settings/integrations/Webhook.vue | 6 +- .../integrations/integrations.routes.js | 2 +- .../dashboard/settings/labels/Index.vue | 6 +- .../settings/labels/labels.routes.js | 2 +- .../settings/profile/profile.routes.js | 2 +- .../dashboard/settings/reports/Index.vue | 7 +- .../reports/components/CsatMetricCard.vue | 9 +- .../reports/components/WootReports.vue | 2 +- .../settings/reports/reports.routes.js | 12 +-- .../routes/dashboard/settings/teams/Index.vue | 4 +- .../dashboard/settings/teams/teams.routes.js | 2 +- app/javascript/packs/application.js | 2 + .../shared/components/EmojiOrIcon.vue | 12 ++- .../components/FluentIcon/DashboardIcon.vue | 35 ++++++++ .../FluentIcon/dashboard-icons.json | 85 +++++++++++++++++++ .../ui/MultiselectDropdownItems.vue | 8 +- .../components/ui/dropdown/AddLabel.vue | 2 +- 151 files changed, 613 insertions(+), 617 deletions(-) delete mode 100644 app/javascript/dashboard/components/widgets/InboxIconWithName.vue delete mode 100644 app/javascript/dashboard/components/widgets/InboxListItem.vue delete mode 100644 app/javascript/dashboard/components/widgets/SearchBox.vue create mode 100644 app/javascript/shared/components/FluentIcon/DashboardIcon.vue create mode 100644 app/javascript/shared/components/FluentIcon/dashboard-icons.json diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss index 1072a0878..7b528d1c2 100644 --- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss +++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss @@ -6,6 +6,10 @@ margin-right: var(--space-smaller); } +.margin-left-minus-slab { + margin-left: var(--space-minus-slab); +} + .fs-small { font-size: var(--font-size-small); } diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss index a7a256b4d..0ad6dff38 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss @@ -85,11 +85,6 @@ text-overflow: ellipsis; white-space: nowrap; width: 27rem; - - .small-icon { - font-size: $font-size-mini; - vertical-align: top; - } } .conversation--meta { diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss index 7a9a83845..cf48bcd6e 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_modal.scss @@ -19,7 +19,7 @@ cursor: pointer; font-size: $font-size-big; line-height: $space-normal; - padding: $space-normal $space-two; + padding: $space-normal; position: absolute; right: $space-micro; top: $space-micro; diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss index aafff16ff..70cad65e8 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss @@ -31,6 +31,8 @@ .wrap, .child-icon { + color: $color-gray; + &:hover { color: $color-woot; } @@ -62,7 +64,7 @@ .bottom-nav { @include flex; @include space-between-column; - @include padding($space-one $space-normal $space-one $space-one); + @include padding($space-one); @include border-normal-top; flex-direction: column; position: relative; @@ -111,16 +113,6 @@ line-height: $global-lineheight; } -.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; diff --git a/app/javascript/dashboard/components/Accordion/AccordionItem.vue b/app/javascript/dashboard/components/Accordion/AccordionItem.vue index bfe817285..2bcfaffb7 100644 --- a/app/javascript/dashboard/components/Accordion/AccordionItem.vue +++ b/app/javascript/dashboard/components/Accordion/AccordionItem.vue @@ -10,8 +10,8 @@
- - + +
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 4a614cf3f..b5053a292 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -27,7 +27,7 @@ l