Skip to content

Use logical positioning instead of physical for bidirectional text support #47343

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
skjnldsv merged 7 commits into from
Aug 29, 2024
Merged

Use logical positioning instead of physical for bidirectional text support #47343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
723780d
feat: Add bidi support in core directory
ahangarha Dec 19, 2023
66fab3f
Fix: background position based on direction
ahangarha Dec 23, 2023
26f4b97
Fix: shorthand paddings and margins
ahangarha Dec 23, 2023
c5baf3d
Fix: float and clear
ahangarha Dec 23, 2023
7b048e0
fix: Adjust some minor styles issues
susnux Aug 20, 2024
aea0e8d
fix: Adjust more places for logical position
susnux Aug 20, 2024
faeb2f0
chore: Add stylelint rules to verify we only use logical properties
susnux Aug 27, 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
Prev Previous commit
Next Next commit
fix: Adjust more places for logical position 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @nextcloud-command
susnux authored and nextcloud-command committed Aug 29, 2024
commit aea0e8df6addb215b187898003afa6e52a984f6a
3 changes: 1 addition & 2 deletions apps/dashboard/src/DashboardApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,10 @@ export default {
background-size: 32px;
width: 32px;
height: 32px;
margin-inline-end: 16px;
background-position: center;
float: left;
margin-top: -6px;
margin-left: 6px;
margin-inline: 6px 16px;
}

img {
Expand Down
4 changes: 2 additions & 2 deletions apps/dav/src/components/AvailabilityForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ export default {
}

.to-text {
padding-right: 12px;
padding-inline-end: 12px;
}

.empty-content {
color: var(--color-text-lighter);
margin-top: 4px;
margin-block-start: var(--default-grid-baseline);
align-self: center;
}
</style>
4 changes: 2 additions & 2 deletions apps/dav/src/views/CalDavSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ export default {

<style scoped>
.indented {
padding-left: 28px;
padding-inline-start: 28px;
}
/** Use deep selector to affect v-html */
* >>> a {
* :deep(a) {
text-decoration: underline;
}
.settings-hint {
Expand Down
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/src/components/PersonalSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default {
return window.location.protocol + '//' + window.location.host + this.logoPath
},
backgroundStyle() {
return `padding:10px;background-color:${this.color};color:${this.textColor};border-radius:3px;padding-left:4px;`
return `padding:10px;background-color:${this.color};color:${this.textColor};border-radius:3px;padding-inline-start:4px;`
},
linkStyle() {
return `background-image:url(${this.logoPathAbsolute});width:50px;height:30px;position:relative;top:8px;background-size:contain;display:inline-block;background-repeat:no-repeat; background-position: center center;`
Expand Down
3 changes: 1 addition & 2 deletions apps/files/css/detailsView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
}

.app-sidebar .thumbnailContainer.large {
margin-inline-start: -15px;
margin-inline-end: -35px; /* 15 + 20 for the close button */
margin-inline: -15px -35px; /* 15 + 20 for the close button */
margin-top: -15px;
}

Expand Down
9 changes: 3 additions & 6 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,7 @@ a.action.action-setreminder {
&.action-menu {
padding-top: 17px;
padding-bottom: 17px;
padding-inline-start: 14px;
padding-inline-end: 14px;
padding-inline: 14px;
}
&.no-permission {
&:hover, &:focus {
Expand Down Expand Up @@ -763,8 +762,7 @@ table.dragshadow {
z-index: 2000;
}
table.dragshadow td.filename {
padding-inline-start: 60px;
padding-inline-end: 16px;
padding-inline: 60px 16px;
height: 36px;

/* Override "max-width: 0" to prevent file name and size from overlapping */
Expand Down Expand Up @@ -912,8 +910,7 @@ table.dragshadow td.size {
}

.notCreatable {
margin-inline-start: 12px;
margin-inline-end: 44px;
margin-inline: 12px 44px;
margin-top: 12px;
color: var(--color-main-text);
overflow: auto;
Expand Down
33 changes: 16 additions & 17 deletions apps/files/src/components/FilesListVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,14 @@ export default defineComponent({
--clickable-area: var(--default-clickable-area);
--icon-preview-size: 32px;

--fixed-top-position: var(--default-clickable-area);
--fixed-block-start-position: var(--default-clickable-area);

overflow: auto;
height: 100%;
will-change: scroll-position;

&:has(.file-list-filters__active) {
--fixed-top-position: calc(var(--default-clickable-area) + var(--default-grid-baseline) + var(--clickable-area-small));
--fixed-block-start-position: calc(var(--default-clickable-area) + var(--default-grid-baseline) + var(--clickable-area-small));
}

& :deep() {
Expand Down Expand Up @@ -366,7 +366,7 @@ export default defineComponent({
}

.files-list__selected {
padding-right: 12px;
padding-inline-end: 12px;
white-space: nowrap;
}

Expand All @@ -375,7 +375,7 @@ export default defineComponent({

&.files-list__table--with-thead-overlay {
// Hide the table header below the overlay
margin-top: calc(-1 * var(--row-height));
margin-block-start: calc(-1 * var(--row-height));
}
}

Expand All @@ -388,16 +388,16 @@ export default defineComponent({
z-index: 10;
// fixed the size
padding-inline: var(--row-height) var(--default-grid-baseline, 4px);
height: var(--fixed-top-position);
height: var(--fixed-block-start-position);
width: 100%;
}

.files-list__thead-overlay {
// Pinned on top when scrolling
position: sticky;
top: var(--fixed-top-position);
top: var(--fixed-block-start-position);
// Save space for a row checkbox
margin-left: var(--row-height);
margin-inline-start: var(--row-height);
// More than .files-list__thead
z-index: 20;

Expand All @@ -406,7 +406,7 @@ export default defineComponent({

// Reuse row styles
background-color: var(--color-main-background);
border-bottom: 1px solid var(--color-border);
border-block-end: 1px solid var(--color-border);
height: var(--row-height);
}

Expand All @@ -424,7 +424,7 @@ export default defineComponent({
// Pinned on top when scrolling
position: sticky;
z-index: 10;
top: var(--fixed-top-position);
top: var(--fixed-block-start-position);
}

tr {
Expand All @@ -433,7 +433,7 @@ export default defineComponent({
align-items: center;
width: 100%;
user-select: none;
border-bottom: 1px solid var(--color-border);
border-block-end: 1px solid var(--color-border);
box-sizing: border-box;
user-select: none;
height: var(--row-height);
Expand Down Expand Up @@ -465,8 +465,7 @@ export default defineComponent({
position: absolute;
display: block;
top: 0;
inset-inline-start: 0;
inset-inline-end: 0;
inset-inline: 0;
bottom: 0;
opacity: .1;
z-index: -1;
Expand Down Expand Up @@ -586,7 +585,7 @@ export default defineComponent({
max-width: calc(var(--icon-preview-size) * 0.5);
color: var(--color-primary-element-text);
// better alignment with the folder icon
margin-top: 2px;
margin-block-start: 2px;

// Improve icon contrast with a background for files
&--file {
Expand Down Expand Up @@ -766,8 +765,8 @@ tbody.files-list__tbody.files-list__tbody--grid {
width: 16px;
height: 16px;
position: absolute;
left: 50%;
margin-left: -8px;
inset-inline-start: 50%;
margin-inline-start: -8px;
z-index: -1;
background: var(--color-main-background);
}
Expand Down Expand Up @@ -801,7 +800,7 @@ tbody.files-list__tbody.files-list__tbody--grid {
.files-list__row-name-text {
margin: 0;
// Ensure that the outline is not too close to the text.
margin-left: -4px;
margin-inline-start: -4px;
padding: 0px 4px;
}
}
Expand All @@ -815,7 +814,7 @@ tbody.files-list__tbody.files-list__tbody--grid {
.files-list__row-actions {
position: absolute;
inset-inline-end: calc(var(--half-clickable-area) / 2);
bottom: calc(var(--mtime-height) / 2);
inset-block-end: calc(var(--mtime-height) / 2);
width: var(--clickable-area);
height: var(--clickable-area);
}
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/views/ReferenceFileWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ export default defineComponent({
min-width: 88px;
max-width: 88px;
padding: 12px;
padding-right: 0;
padding-inline-end: 0;
display: flex;
align-items: center;
justify-content: center;
Expand Down
3 changes: 1 addition & 2 deletions apps/files_external/src/css/fileEntryStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
position: absolute;
display: block;
top: 0;
inset-inline-start: 0;
inset-inline-end: 0;
inset-inline: 0;
bottom: 0;
opacity: .1;
z-index: -1;
Expand Down
3 changes: 1 addition & 2 deletions apps/files_reminders/src/actions/setReminderSuggestionActions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
display: flex;
height: 0;
position: absolute;
inset-inline-start: 0;
inset-inline-end: 0;
inset-inline: 0;
top: -10px;
}
}
2 changes: 1 addition & 1 deletion apps/files_sharing/src/actions/sharingStatusAction.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// put icon at the end of the button
direction: rtl;
// align icons with textless inline actions
padding-right: 0 !important;
padding-inline-end: 0 !important;
}

svg.sharing-status__avatar {
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/NewFileRequestDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ export default defineComponent({
width: auto;
margin-inline: 12px;
span.dialog__actions-separator {
margin-left: auto;
margin-inline-start: auto;
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default {
height: 44px;
&__summary {
padding: 8px;
padding-left: 10px;
padding-inline-start: 10px;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntryInherited.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default {
flex-direction: column;
justify-content: space-between;
padding: 8px;
padding-left: 10px;
padding-inline-start: 10px;
line-height: 1.2em;
p {
color: var(--color-text-maxcontrast);
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntryLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ export default {

&__summary {
padding: 8px;
padding-left: 10px;
padding-inline-start: 10px;
display: flex;
justify-content: space-between;
flex: 1 0;
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntrySimple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default {
min-height: 44px;
&__desc {
padding: 8px;
padding-left: 10px;
padding-inline-start: 10px;
line-height: 1.2em;
position: relative;
flex: 1 1;
Expand Down
10 changes: 5 additions & 5 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ export default {

h1 {
font-size: 15px;
padding-left: 0.3em;
padding-inline-start: 0.3em;
}

}
Expand All @@ -1060,7 +1060,7 @@ export default {
overflow: scroll;
flex-shrink: 1;
padding: 4px;
padding-right: 12px;
padding-inline-end: 12px;
}

&__quick-permissions {
Expand Down Expand Up @@ -1117,7 +1117,7 @@ export default {
width: 100%;
margin-bottom: 0.5em;
text-align: start;
padding-left: 0;
padding-inline-start: 0;

section {

Expand All @@ -1142,14 +1142,14 @@ export default {
*/
span {
::v-deep label {
padding-left: 0 !important;
padding-inline-start: 0 !important;
background-color: initial !important;
border: none !important;
}
}

section.custom-permissions-group {
padding-left: 1.5em;
padding-inline-start: 1.5em;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/oauth2/src/components/OAuthItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ export default {
.action-column {
display: flex;
justify-content: flex-end;
padding-right: 0;
padding-inline-end: 0;
}
</style>
3 changes: 1 addition & 2 deletions apps/settings/src/components/AdminTwoFactor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ export default {
.two-factor-loading {
display: inline-block;
vertical-align: sub;
margin-inline-start: -2px;
margin-inline-end: 1px;
margin-inline: -2px 1px;
}

.top-margin {
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/src/components/AppList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,14 @@ $toolbar-height: 44px + $toolbar-padding * 2;
}

#app-list-update-all {
margin-left: 10px;
margin-inline-start: 10px;
}

&__toolbar {
height: $toolbar-height;
padding: $toolbar-padding;
// Leave room for app-navigation-toggle
padding-left: $toolbar-height;
padding-inline-start: $toolbar-height;
width: 100%;
background-color: var(--color-main-background);
position: sticky;
Expand Down
Loading