diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss index c9b4b7b12..ece12c999 100644 --- a/app/javascript/dashboard/assets/scss/_date-picker.scss +++ b/app/javascript/dashboard/assets/scss/_date-picker.scss @@ -14,11 +14,11 @@ } .mx-input { - border: 1px solid var(--color-border); + border: 1px solid var(--s-200); border-radius: var(--border-radius-normal); box-shadow: none; display: flex; - height: 4.6rem; + height: 4.0rem; } .mx-input:disabled, diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss index 2f817b125..5753e7593 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss @@ -7,6 +7,10 @@ } } +select { + height: 4.0rem; +} + .card { margin-bottom: var(--space-small); padding: var(--space-normal); @@ -64,7 +68,3 @@ code { .padding-right-small { padding-right: var(--space-one); } - -.margin-right-small { - margin-right: var(--space-small); -} diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss index 2645e6798..06c963a93 100644 --- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss +++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss @@ -1,7 +1,3 @@ -.margin-right-small { - margin-right: var(--space-small); -} - .margin-bottom-small { margin-bottom: var(--space-small); } diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss index 9fcf1ea66..f1548fbea 100644 --- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss +++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss @@ -169,7 +169,7 @@ } .multiselect-wrap--small { - $multiselect-height: 3.8rem; + $multiselect-height: 4.0rem; .multiselect__tags, .multiselect__input { diff --git a/app/javascript/dashboard/assets/scss/widgets/_reports.scss b/app/javascript/dashboard/assets/scss/widgets/_reports.scss index 742129655..d55dbd5a3 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_reports.scss @@ -1,11 +1,3 @@ -.date-picker { - margin-left: var(--space-smaller); -} - -.margin-left-small { - margin-left: var(--space-smaller); -} - .reports-option__rounded--item { border-radius: 100%; height: var(--space-two); @@ -26,6 +18,10 @@ display: flex; } +.reports-option__title { + margin: 0 var(--space-small); +} + .business-hours { align-items: center; display: flex; @@ -37,6 +33,7 @@ .business-hours-text { font-size: var(--font-size-small); + margin: 0 var(--space-small); } .switch { diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue index 6bcd9a790..fddfc3309 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue @@ -24,16 +24,13 @@ - + {{ snoozedDisplayText }} -
+
{{ agent.name }}
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue index 2228320bb..e801bcc48 100644 --- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue +++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue @@ -29,7 +29,7 @@
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue index aa3f18318..b09b23f24 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue @@ -58,6 +58,7 @@
-
+

{{ $t('LABEL_REPORTS.FILTER_DROPDOWN_LABEL') }}

@@ -60,7 +64,7 @@
@@ -88,7 +92,7 @@
-
+