From bfb445186d215065ede0aa0b4e5156a3cea263ed Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:50:21 +0530 Subject: [PATCH] chore: Refactor reports css for RTL (#6537) --- .../assets/scss/widgets/_report.scss | 36 +++++++++---------- .../assets/scss/widgets/_reports.scss | 3 +- .../components/widgets/UserAvatarWithName.vue | 2 +- .../reports/components/CsatMetricCard.vue | 5 ++- .../reports/components/CsatMetrics.vue | 2 +- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/app/javascript/dashboard/assets/scss/widgets/_report.scss b/app/javascript/dashboard/assets/scss/widgets/_report.scss index 6caf2cac7..e9ce5d0bd 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_report.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_report.scss @@ -3,23 +3,23 @@ cursor: pointer; margin: 0; - padding: $space-normal $space-small $space-normal $space-two; + padding: var(--space-normal); &.active { - @include custom-border-top(3px, $color-woot); + @include custom-border-top(3px, var(--color-woot)); @include background-white; .heading, .metric { - color: $color-woot; + color: var(--color-woot); } } .heading { align-items: center; - color: $color-heading; + color: var(--color-heading); display: flex; - font-size: $font-size-small; - font-weight: $font-weight-bold; + font-size: var(--font-size-small); + font-weight: var(--font-weight-bold); margin: 0; } @@ -29,19 +29,19 @@ } .metric-wrap { - align-items: baseline; + align-items: center; display: flex; } .metric { - font-size: $font-size-big; - font-weight: $font-weight-feather; - margin-top: $space-smaller; + font-size: var(--font-size-big); + font-weight: var(--font-weight-feather); + margin-top: var(--space-smaller); } .metric-trend { - font-size: $font-size-small; - margin-left: $space-small; + font-size: var(--font-size-small); + margin: 0 var(--space-small); } .metric-up { @@ -53,7 +53,7 @@ } .desc { - font-size: $font-size-small; + font-size: var(--font-size-small); margin: 0; text-transform: capitalize; } @@ -62,8 +62,8 @@ .report-bar { @include background-white; @include border-light; - margin: -1px $zero; - padding: $space-small $space-medium; + margin: var(--space-minus-micro) 0; + padding: var(--space-small) var(--space-medium); .chart-container { @include flex; @@ -76,12 +76,12 @@ .empty-state { color: $color-gray; - font-size: $font-size-default; - margin: $space-jumbo; + font-size: var(--font-size-default); + margin: var(--space-jumbo); } .business-hours { - margin: $space-normal; + margin: var(--space-normal); text-align: center; } } diff --git a/app/javascript/dashboard/assets/scss/widgets/_reports.scss b/app/javascript/dashboard/assets/scss/widgets/_reports.scss index d55dbd5a3..c848bc0c8 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_reports.scss @@ -25,8 +25,7 @@ .business-hours { align-items: center; display: flex; - justify-content: end; - margin-bottom: var(--space-normal); + justify-content: flex-start; margin-left: auto; padding-right: var(--space-normal); } diff --git a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue index 9c0ebf87f..35f6de9d6 100644 --- a/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue +++ b/app/javascript/dashboard/components/widgets/UserAvatarWithName.vue @@ -6,7 +6,7 @@ :username="user.name" :status="user.availability_status" /> -
+
{{ user.name }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue index d24e95216..1846d1549 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue @@ -35,8 +35,7 @@ export default { diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue index 227b619d2..9144e95c1 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue @@ -103,6 +103,6 @@ export default { } .emoji--distribution-key { - margin-right: var(--space-micro); + margin: 0 var(--space-micro); }