Skip to content

Commit

Permalink
[4.x] RTL support in the Control Panel (#9447)
Browse files Browse the repository at this point in the history
Co-authored-by: Jason Varga <jason@pixelfear.com>
  • Loading branch information
peimn and jasonvarga committed Mar 11, 2024
1 parent 4025625 commit 478a665
Show file tree
Hide file tree
Showing 207 changed files with 924 additions and 789 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"vue": "^2.7.14",
"vue-clickaway": "~2.2.2",
"vue-countable": "^1.0.9",
"vue-draggable-nested-tree": "^2.2.20",
"vue-draggable-nested-tree": "^2.3.0-beta.1",
"vue-js-modal": "^2.0.1",
"vue-select": "^3.10.1",
"vue-toasted": "^1.1.27",
Expand Down
12 changes: 6 additions & 6 deletions resources/css/components/array.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
}
.array-table {
@apply rounded text-sm text-left w-full;
@apply rounded text-sm rtl:text-right ltr:text-left w-full;
&:focus {
@apply outline-none;
}
Expand All @@ -25,28 +25,28 @@
}

th {
@apply border-r p-2 bg-gray-300;
@apply rtl:border-l ltr:border-r p-2 bg-gray-300;
}

td {
@apply p-0 m-0;
}

tr:first-child th {
@apply rounded-tl;
@apply rtl:rounded-tr ltr:rounded-tl;
}

tr:first-child td,
tr:first-child .input-text-minimal {
@apply rounded-tr;
@apply rtl:rounded-tl ltr:rounded-tr;
}

tr:last-child th {
@apply rounded-bl;
@apply rtl:rounded-br ltr:rounded-bl;
}
tr:last-child td:last-child,
tr:last-child .input-minimal {
@apply rounded-br;
@apply rtl:rounded-bl ltr:rounded-br;
}

&:focus-within {
Expand Down
12 changes: 6 additions & 6 deletions resources/css/components/assets.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
i {
position: relative;
top: -1px;
margin-right: 10px;
margin-right: 10px ; [dir="rtl"] & { margin-left: 10px ; margin-right: 0 ; }
}
}
}
Expand Down Expand Up @@ -60,12 +60,12 @@

.search {
flex: 1;
margin-right: 15px;
margin-left: 0;
margin-right: 15px ; [dir="rtl"] & { margin-left: 15px ; margin-right: 0 ; }
margin-left: 0 ; [dir="rtl"] & { margin-right: 0 ; margin-left: 0 ; }
}

> .btn {
margin-right: 15px;
margin-right: 15px ; [dir="rtl"] & { margin-left: 15px ; margin-right: 0 ; }
}
}

Expand Down Expand Up @@ -148,9 +148,9 @@

> * {
@apply absolute w-auto h-auto max-w-full max-h-full;
left: 50%;
left: 50% ; [dir="rtl"] & { left: auto ; right: 50% ; }
top: 50%;
transform: translate(-50%, -50%);
transform: translate(-50%, -50%) ; [dir="rtl"] & { transform: translate(50%, -50%); }
box-shadow: 0 0 32px rgba(0, 0, 0, .35);
}
}
Expand Down
4 changes: 3 additions & 1 deletion resources/css/components/blueprints.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
&:before {
content: '';
@apply border rounded absolute bg-gray-200 shadow-sm;
top: -3px; left: 6px; right: 0; bottom: 3px; z-index: 1;
top: -3px; left: 6px ; right: 0 ; bottom: 3px; z-index: 1;

[dir="rtl"] & { left: 0 ; right: 6px ; }
}
}

Expand Down
2 changes: 1 addition & 1 deletion resources/css/components/configure.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
> .publish-fields > .toggle-fieldtype {
@apply flex justify-between items-center flex-wrap;
.help-block, .help-block p { @apply mb-0; }
.field-inner { @apply pr-8; }
.field-inner { @apply rtl:pl-8 ltr:pr-8; }
}
}
6 changes: 3 additions & 3 deletions resources/css/components/fieldtypes/array.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
tr:last-child {
td, th { border-radius: 0; }
}
tr > :first-child { border-left: 0; }
tr > :last-child { border-right: 0; }
tr > :first-child { border-left: 0 ; [dir="rtl"] & { border-left: 0 ; border-right: 0 ; } }
tr > :last-child { border-right: 0 ; [dir="rtl"] & { border-right: 0 ; border-left: 0 ; } }
}

/* Dynamic Mode */
.array-dynamic .btn {
@apply text-blue block w-full h-auto border-0 text-left shadow-none;
@apply text-blue block w-full h-auto border-0 rtl:text-right ltr:text-left shadow-none;
background: #f4f4f4;
padding: 10px 10px 11px;
margin: 15px 0 0;
Expand Down
4 changes: 2 additions & 2 deletions resources/css/components/fieldtypes/assets.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.asset-upload-control {
@apply mt-2 @sm:ml-4 @sm:mt-0 text-xs text-gray-600 leading-tight;
@apply mt-2 @sm:rtl:mr-4 @sm:ltr:ml-4 @sm:mt-0 text-xs text-gray-600 leading-tight;
}

.upload-text-button {
Expand All @@ -26,7 +26,7 @@
}

.assets-fieldtype .drag-drop-text {
@apply ml-1 text-gray-700;
@apply rtl:mr-1 ltr:ml-1 text-gray-700;
}

.assets-fieldtype .asset-upload-control {
Expand Down
28 changes: 14 additions & 14 deletions resources/css/components/fieldtypes/bard.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
border-top-color: black;
position: absolute;
top: 100%;
left: 50%;
left: 50% ; [dir="rtl"] & { left: auto ; right: 50% ; }
margin-left: -3px
}

Expand Down Expand Up @@ -163,7 +163,7 @@
}

.bard-add-set-button {
@apply flex items-center justify-center absolute -left-4 top-[-6px] z-1;
@apply flex items-center justify-center absolute rtl:-right-4 ltr:-left-4 top-[-6px] z-1;
}

.bard-footer-toolbar {
Expand Down Expand Up @@ -192,8 +192,8 @@
/* transition: all .15s ease-in-out; */

.dropdown-menu {
left: -5px;
right: auto;
left: -5px ; [dir="rtl"] & { left: auto ; right: -5px ; }
right: auto ; [dir="rtl"] & { right: auto ; left: auto ; }
}
}

Expand Down Expand Up @@ -240,16 +240,16 @@
}

.bard-set-selector {
@apply ml-6;
@apply rtl:mr-6 ltr:ml-6;
}

.bard-field-options {
@apply fixed top-0 inset-x-0 bg-gray-700 p-4 w-full;
text-align: right;
@apply ltr:text-right rtl:text-left;
z-index: 1; /* to appear over the top of .bard-editor */

.icon { font-size: 24px; }
a { margin-left: 16px; color: #fff; opacity: 1; }
a { margin-left: 16px ; [dir="rtl"] & { margin-right: 16px ; margin-left: 0 ; } color: #fff; opacity: 1; }
}
}

Expand Down Expand Up @@ -382,14 +382,14 @@
padding: 0;
margin: 0;
margin-bottom: .85em;
padding-left: 2em;
padding-left: 2em ; [dir="rtl"] & { padding-right: 2em ; padding-left: 0 ; }
}

.tableWrapper table ol,
.tableWrapper table ul {
padding: 0;
margin: 0;
padding-left: 2em;
padding-left: 2em ; [dir="rtl"] & { padding-right: 2em ; padding-left: 0 ; }
}

ol ol,
Expand All @@ -398,7 +398,7 @@
ul ul {
margin-top: 0;
margin-bottom: 0;
padding-left: 2em;
padding-left: 2em ; [dir="rtl"] & { padding-right: 2em ; padding-left: 0 ; }
}

ul ul {
Expand All @@ -418,7 +418,7 @@
}

blockquote {
@apply text-gray-800 border-l-4 border-blue px-4;
@apply text-gray-800 rtl:border-r-4 ltr:border-l-4 border-blue px-4;
margin: 0 0 .85em;
}

Expand All @@ -439,7 +439,7 @@
table-layout: fixed;

th {
@apply font-bold text-left bg-gray-200;
@apply font-bold rtl:text-right ltr:text-left bg-gray-200;
}

td, th {
Expand Down Expand Up @@ -490,7 +490,7 @@
.bard-fieldtype .ProseMirror > p.is-editor-empty:first-child::before {
@apply text-gray-600;
content: attr(data-placeholder);
float: left;
float: left ; [dir="rtl"] & { float: right ; }
height: 0;
pointer-events: none;
}
Expand Down Expand Up @@ -538,6 +538,6 @@
table .column-resize-handle {
@apply absolute top-0 bottom-0 pointer-events-none bg-blue-200;
width: 3px;
right: -2px;
right: -2px ; [dir="rtl"] & { right: auto ; left: -2px ; }
}
}
2 changes: 1 addition & 1 deletion resources/css/components/fieldtypes/checkboxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
}

.option + label {
@apply ml-2;
@apply rtl:mr-2 ltr:ml-2;
}
}
8 changes: 8 additions & 0 deletions resources/css/components/fieldtypes/code.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
.code-fieldtype-container {
direction: ltr;
}

.code-fieldtype-toolbar {
@apply bg-white shadow-none rounded-t border border-b-0 text-sm flex flex-wrap items-center justify-end gap-2;
padding: 4px 8px;

[dir='rtl'] & {
direction: rtl;
}
}

.code-fieldtype-toolbar select {
Expand Down
4 changes: 2 additions & 2 deletions resources/css/components/fieldtypes/datetime.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.daterange {
outline: none;
width: 100%;
.icon-remove { right: 32px; }
.icon-remove { right: 32px ; [dir="rtl"] & { right: auto ; left: 32px ; } }

.dr-calendar { max-width: 250px; }

Expand All @@ -24,7 +24,7 @@
color: #777;
height: 18px;
width: 18px;
margin-right: 8px;
margin-right: 8px ; [dir="rtl"] & { margin-left: 8px ; margin-right: 0 ; }
text-shadow: 0 1px 1px #FFF;
}

Expand Down
2 changes: 1 addition & 1 deletion resources/css/components/fieldtypes/environment.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.icon {
display: inline-block;
vertical-align: middle;
margin-right: 5px;
margin-right: 5px ; [dir="rtl"] & { margin-left: 5px ; margin-right: 0 ; }
&:before {
top: 1px;
}
Expand Down
16 changes: 8 additions & 8 deletions resources/css/components/fieldtypes/grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
========================================================================== */

.grid-table {
@apply w-full text-left border text-gray relative mb-4 outline-none shadow-sm rounded;
@apply w-full rtl:text-right ltr:text-left border text-gray relative mb-4 outline-none shadow-sm rounded;
border-collapse: separate;
border-spacing: 0;
table-layout: auto;
Expand All @@ -17,8 +17,8 @@
top: -1px;
z-index: auto;

&:first-child { @apply rounded-tl pl-3; }
&:last-child { @apply rounded-tr; }
&:first-child { @apply rtl:rounded-tr ltr:rounded-tl rtl:pr-3 ltr:pl-3; }
&:last-child { @apply rtl:rounded-tl ltr:rounded-tr; }
&.grid-drag-handle-header {
@apply w-3;
}
Expand All @@ -40,11 +40,11 @@
@apply border-b px-2 py-3 align-top;

&:first-child.grid-cell {
@apply pl-3;
@apply rtl:pr-3 ltr:pl-3;
}

&.drag-handle {
@apply border-r h-full p-2;
@apply rtl:border-l ltr:border-r h-full p-2;
width: 1%;
cursor: grab;
background: theme('colors.gray.200') url('../../../svg/icons/light/drag-dots.svg') center center no-repeat;
Expand All @@ -55,8 +55,8 @@

tr:last-child td {
@apply border-b-0;
&:first-child { @apply rounded-bl; }
&:last-child { @apply rounded-br; }
&:first-child { @apply rtl:rounded-br ltr:rounded-bl; }
&:last-child { @apply rtl:rounded-bl ltr:rounded-br; }
}

tr.draggable-source--is-dragging td {
Expand All @@ -65,7 +65,7 @@
}

.grid-table tbody .row-controls {
@apply pl-0 text-center;
@apply rtl:pr-0 ltr:pl-0 text-center;
width: 1%;
padding-top: 21px; /* pseudo-center for text/select fields */
}
Expand Down
4 changes: 2 additions & 2 deletions resources/css/components/fieldtypes/markdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
@apply flex items-center;

button {
@apply text-gray-700 inline-block focus:outline-none px-2 py-1 mr-1;
@apply text-gray-700 inline-block focus:outline-none px-2 py-1 rtl:ml-1 ltr:mr-1;

&:hover {
@apply text-blue;
Expand Down Expand Up @@ -154,7 +154,7 @@
}

.markdown-preview {
@apply border-none p-2 text-left;
@apply border-none p-2 rtl:text-right ltr:text-left;
p { line-height: 1.2; }
}
}
Expand Down
Loading

0 comments on commit 478a665

Please sign in to comment.