Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Adds support on direction RTL in UI #6369

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5cb766e
feat: Adds support on direction RTL in UI
iamsivin Feb 1, 2023
e0ca0ef
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 2, 2023
c93b4bd
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 3, 2023
433c4f3
chore: Minor changes
iamsivin Feb 3, 2023
5ba76f6
chore: Minor changes
iamsivin Feb 3, 2023
e4300c4
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 3, 2023
802436a
chore: Updated with ui settings
iamsivin Feb 3, 2023
6c7b2cd
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 5, 2023
1a4b5cb
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 6, 2023
2966fb3
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 7, 2023
ada5292
chore: Minor fixes
iamsivin Feb 7, 2023
285ce14
chore: Settings page
iamsivin Feb 7, 2023
d462f7b
chore: Review comments
iamsivin Feb 7, 2023
8e71750
chore: Minor fixes
iamsivin Feb 7, 2023
d2cb4b6
chore: Adds tests and CSS changes
iamsivin Feb 7, 2023
292b240
chore: Minor fixes
iamsivin Feb 8, 2023
9002ab9
chore: Contact page
iamsivin Feb 8, 2023
8026042
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 8, 2023
7e1fe9e
chore: Contact note page
iamsivin Feb 8, 2023
5900f6a
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 8, 2023
2b55751
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 8, 2023
158dc29
chore: Review fixes
iamsivin Feb 10, 2023
debc5b2
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 10, 2023
d7392b6
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 10, 2023
427cfc8
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 13, 2023
832f004
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 14, 2023
6158899
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 15, 2023
92c2915
feat: Adds support on direction RTL in UI (2) (#6430)
iamsivin Feb 15, 2023
8159936
chore: Code clean up
iamsivin Feb 15, 2023
68df8bf
chore: Minor fixes
iamsivin Feb 15, 2023
a582682
chore: Clean up code
iamsivin Feb 15, 2023
9920f76
chore: Minor fixes
iamsivin Feb 15, 2023
0da4061
chore: Minor fixes
iamsivin Feb 15, 2023
94e2191
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 16, 2023
2136725
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 16, 2023
780148d
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 17, 2023
2cab7a5
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 17, 2023
1a53901
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 17, 2023
a930670
chore: Code clean up
iamsivin Feb 20, 2023
47a849f
chore: Code clean up in buttons.scss
iamsivin Feb 20, 2023
e07a937
feat: Adds rtl related scss to a single file (#6458)
iamsivin Feb 20, 2023
34be639
chore: Code clean up
iamsivin Feb 20, 2023
a256784
chore: Code clean up
iamsivin Feb 20, 2023
cd9315d
Merge branch 'develop' into feat/rtl-support
vishnu-narayanan Feb 20, 2023
562104f
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 21, 2023
bcb8c8b
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 21, 2023
91a592d
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 22, 2023
a4972c3
Merge branch 'develop' into feat/rtl-support
iamsivin Feb 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/javascript/dashboard/App.vue
@@ -1,5 +1,10 @@
<template>
<div v-if="!authUIFlags.isFetching" id="app" class="app-wrapper app-root">
<div
v-if="!authUIFlags.isFetching"
id="app"
class="app-wrapper app-root"
:class="{ 'app-rtl--wrapper': isRTLView }"
>
<update-banner :latest-chatwoot-version="latestChatwootVersion" />
<transition name="fade" mode="out-in">
<router-view />
Expand All @@ -22,6 +27,8 @@ import NetworkNotification from './components/NetworkNotification';
import UpdateBanner from './components/app/UpdateBanner.vue';
import vueActionCable from './helper/actionCable';
import WootSnackbarBox from './components/SnackbarContainer';
import rtlMixin from 'shared/mixins/rtlMixin';

import {
registerSubscription,
verifyServiceWorkerExistence,
Expand All @@ -37,6 +44,7 @@ export default {
UpdateBanner,
WootSnackbarBox,
},
mixins: [rtlMixin],

data() {
return {
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/dashboard/assets/scss/_rtl.scss
@@ -0,0 +1,4 @@
.app-rtl--wrapper {
direction: rtl;
unicode-bidi: embed;
}
10 changes: 10 additions & 0 deletions app/javascript/dashboard/assets/scss/_utility-helpers.scss
Expand Up @@ -14,6 +14,10 @@
margin-left: var(--space-minus-slab);
}

.margin-right-minus-slab {
margin-right: var(--space-minus-slab);
}

.fs-small {
font-size: var(--font-size-small);
}
Expand Down Expand Up @@ -75,3 +79,9 @@
align-items: center;
display: flex;
}

.button--fixed-top {
position: fixed;
right: $space-small;
top: $space-small;
}
1 change: 1 addition & 0 deletions app/javascript/dashboard/assets/scss/_woot.scss
Expand Up @@ -41,6 +41,7 @@
@import 'layout';
@import 'animations';
@import 'foundation-custom';
@import 'rtl';

@import 'widgets/buttons';
@import 'widgets/conv-header';
Expand Down
Expand Up @@ -48,7 +48,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
width: fit-content;
}

p {
Expand Down
Expand Up @@ -26,6 +26,8 @@
}

.wizard-box {
direction: ltr;

.item {
@include background-light;

Expand Down
Expand Up @@ -18,12 +18,14 @@
}
}

.integration--title {
font-size: $font-size-large;
.integration--type {
display: flex;
flex-direction: column;
justify-content: center;
}

.integration--description {
padding-right: $space-medium;
.integration--title {
font-size: $font-size-large;
}

.button-wrap {
Expand Down
24 changes: 8 additions & 16 deletions app/javascript/dashboard/assets/scss/widgets/_buttons.scss
Expand Up @@ -50,22 +50,22 @@ $default-button-height: 4.0rem;

&.secondary {
border-color: var(--s-200);
color: var(--s-700)
color: var(--s-700);
}

&.success {
border-color: var(--s-200);
color: var(--g-700)
color: var(--g-700);
}

&.alert {
border-color: var(--s-200);
color: var(--r-700)
color: var(--r-700);
}

&.warning {
border-color: var(--s-200);
color: var(--y-700)
color: var(--y-700);
}

&:hover {
Expand Down Expand Up @@ -116,19 +116,19 @@ $default-button-height: 4.0rem;
color: var(--w-700);

&.secondary {
color: var(--s-700)
color: var(--s-700);
}

&.success {
color: var(--g-700)
color: var(--g-700);
}

&.alert {
color: var(--r-700)
color: var(--r-700);
}

&.warning {
color: var(--y-700)
color: var(--y-700);
}

&:hover {
Expand Down Expand Up @@ -203,13 +203,5 @@ $default-button-height: 4.0rem;
text-decoration: underline;
}
}

}


// @TDOD move to utility file
.button--fixed-right-top {
position: fixed;
right: $space-small;
top: $space-small;
}
Expand Up @@ -16,7 +16,7 @@
border-left: $space-micro solid transparent;
border-top: 1px solid transparent;
cursor: pointer;
padding: 0 0 0 $space-normal;
padding: 0 $space-normal;
position: relative;

&.active {
Expand Down Expand Up @@ -51,13 +51,17 @@
@include border-light-bottom;
@include border-light-top;
border-bottom-color: transparent;
margin: 0 0 0 $space-one;
padding: $space-slab 0;
}

.conversation-user--wrap {
display: flex;
justify-content: space-between;
}

.conversation--user {
font-size: $font-size-small;
margin-bottom: 0;
margin: 0 $space-one;
text-transform: capitalize;

.label {
Expand All @@ -77,7 +81,7 @@
font-weight: $font-weight-normal;
height: $space-medium;
line-height: $space-medium;
margin: 0;
margin: 0 $space-one;
max-width: 96%;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
Expand Up @@ -69,6 +69,10 @@
@include flex;
flex-direction: column;

.conversations-list--header {
padding: var(--space-one) var(--space-normal) 0;
}

.load-more-conversations {
font-size: $font-size-small;
margin: 0;
Expand All @@ -81,8 +85,8 @@
}

.conversations-list {
overflow-y: auto;
flex: 1 1;
overflow-y: auto;

@include breakpoint(large up) {
@include scroll-on-hover;
Expand All @@ -93,11 +97,10 @@
@include flex;
align-items: center;
justify-content: space-between;
padding: $zero $zero $space-micro;
padding: $space-smaller $zero $space-micro;

.page-title {
margin-bottom: $zero;
margin-left: $space-normal;
}

.status--filter {
Expand All @@ -106,7 +109,7 @@
float: right;
font-size: $font-size-mini;
height: $space-medium;
margin: 0;
margin: 0 var(--space-smaller);
padding: $zero $space-medium $zero $space-normal;
width: auto;
}
Expand Down Expand Up @@ -324,8 +327,7 @@
font-size: var(--font-size-small);
justify-content: center;
margin: var(--space-smaller) 0;
padding: var(--space-smaller) var(--space-micro) var(--space-smaller)
var(--space-one);
padding: var(--space-smaller) var(--space-small);

.is-text {
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/dashboard/assets/scss/widgets/_report.scss
Expand Up @@ -41,7 +41,7 @@

.metric-trend {
font-size: $font-size-small;
margin-left: $space-small;
margin: 0 $space-small;
}

.metric-up {
Expand Down
9 changes: 9 additions & 0 deletions app/javascript/dashboard/assets/scss/widgets/_reports.scss
Expand Up @@ -6,6 +6,10 @@
margin-left: var(--space-smaller);
}

.margin-right-small {
margin-right: var(--space-smaller);
}

.reports-option__rounded--item {
border-radius: 100%;
height: var(--space-two);
Expand All @@ -26,6 +30,10 @@
display: flex;
}

.reports-option__title {
margin: 0 var(--space-small);
}

.business-hours {
align-items: center;
display: flex;
Expand All @@ -37,6 +45,7 @@

.business-hours-text {
font-size: var(--font-size-small);
margin: 0 var(--space-small);
}

.switch {
Expand Down
6 changes: 5 additions & 1 deletion app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
Expand Up @@ -65,9 +65,13 @@

.header--icon {
display: block;
margin-right: $space-normal;
margin-left: $space-small;

@media screen and (max-width: 1200px) {
display: none;
}
}

.header-title {
margin: 0 $space-small;
}
2 changes: 1 addition & 1 deletion app/javascript/dashboard/assets/scss/widgets/_tabs.scss
Expand Up @@ -55,7 +55,7 @@
color: $color-gray;
font-size: $font-size-micro;
font-weight: $font-weight-black;
margin-left: $space-smaller;
margin: 0 $space-smaller;
padding: $space-smaller;
}

Expand Down
Expand Up @@ -5,6 +5,7 @@ table {
thead {
th {
font-weight: $font-weight-bold;
text-align: left;
text-transform: uppercase;
}
}
Expand Down