') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [4.x] RTL support in the Control Panel by peimn · Pull Request #9447 · statamic/cms · GitHub
Skip to content

[4.x] RTL support in the Control Panel#9447

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.

Sign up for GitHub

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

Merged
jasonvarga merged 23 commits into from
Mar 11, 2024
Merged

[4.x] RTL support in the Control Panel #9447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
330c578
[4.x] make placeholders translatable
peimn Jan 19, 2024
da5df71
Merge branch 'statamic:4.x' into 4.x
peimn Jan 25, 2024
471f81d
[4.x] add direction to config object
peimn Feb 1, 2024
5bcb384
Merge branch 'statamic:4.x' into 4.x
peimn Feb 1, 2024
3b8d518
Merge branch '4.x' into rtl
peimn Feb 1, 2024
8a7c685
[4.x] use rtl-enabled version of draggable tree
peimn Feb 1, 2024
0dfc293
[4.x] add rtl style for control panel
peimn Feb 1, 2024
37f7c94
[4.x] fix tests for rtl
peimn Feb 1, 2024
b6b1f73
[4.x] fix tests for rtl
peimn Feb 1, 2024
d432d59
[4.x] slug field has to be ltr
peimn Feb 1, 2024
d1f3c86
[4.x] missed lock file added
peimn Feb 1, 2024
52e8eb7
[4.x] rm applied font
peimn Feb 2, 2024
b55e129
[4.x] fix style for ltr inputs
peimn Feb 2, 2024
599a260
Merge branch 'statamic:4.x' into 4.x
peimn Feb 2, 2024
384a913
Merge branch '4.x' into rtl
peimn Feb 2, 2024
4616a8f
Merge branch '4.x' into rtl
jasonvarga Mar 8, 2024
83e1247
update email view after merge
jasonvarga Mar 8, 2024
5bb3818
update dates after merge
jasonvarga Mar 8, 2024
3916260
remove enforcement of direction on slug fields
jasonvarga Mar 8, 2024
5144c20
Revert "remove enforcement of direction on slug fields"
jasonvarga Mar 8, 2024
8384b57
The direction of the CP comes from the selected locale, which may be …
jasonvarga Mar 8, 2024
f1b2e06
remove unnecessary test changes
jasonvarga Mar 11, 2024
1c97422
wip
jasonvarga Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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