Skip to content

Use "display: grid" for widget positioning [PREVIEW] #53

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
merged 7 commits into from
Jan 24, 2024
Merged

Use "display: grid" for widget positioning [PREVIEW] #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13aa8b6
Use "display: grid" for widget positioning [PREVIEW]
nicoe Oct 10, 2023
d770a37
Merge remote-tracking branch 'origin/master' into PCLAS-122/use_displ…
JCavallo Nov 10, 2023
6b60475
Merge branch 'master' into PCLAS-122/use_display_grid
nicoe Nov 20, 2023
2af7b47
Synchronize with upstream version
nicoe Nov 20, 2023
3ae77ba
Adapt group_sync mixed widget call to display: grid [CUSTOM]
nicoe Nov 20, 2023
e346b37
Limit colspan to the number columns [PREVIEW]
nicoe Nov 21, 2023
b9f36e2
Merge remote-tracking branch 'origin/master' into PCLAS-122/use_displ…
JCavallo Jan 24, 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
1 change: 1 addition & 0 deletions sao/CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
* Use grid layout for form container
* Don't reset date/datetime/time to None when it is invalid

Version 6.8.2 - 2023-09-06
Expand Down
73 changes: 59 additions & 14 deletions sao/src/sao.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,25 +629,17 @@ img.icon {
.form {
width: 100%;
.form-container, .form-hcontainer, .form-vcontainer {
display: inline-table;
display: grid;
}
table.form-container > tbody > tr > td {
.form-item {
display: flex;
padding: 2px;
}
table.form-hcontainer > tbody > tr > td {
padding-top: 0px;
padding-bottom: 0px;

> .btn {
margin-top: 2px;
margin-bottom: 2px;
&.form-empty {
padding: 0px;
}
}
table.form-vcontainer > tbody > tr > td {
padding-left: 0px;
padding-right: 0px;
}
td.form-label {
.form-label {
white-space: pre;
}
.form-char, .form-password, .form-integer, .form-float, .form-date,
Expand Down Expand Up @@ -796,6 +788,49 @@ img.icon {
vertical-align: middle;
}
}

.xexpand {
width: 100%;
}

.xfill {
justify-content: stretch;
}

.yexpand {
height: 100%;
}

.xalign-start {
justify-self: start;
justify-content: start;
}

.xalign-center {
justify-self: center;
justify-content: center;
}

.xalign-end {
justify-self: end;
justify-content: end;
}

.yalign-start {
align-items: start;
}

.yalign-center {
align-items: center;
}

.yalign-end {
align-items: end;
}

.yfill {
align-self: stretch;
}
}

.form-binary, .editabletree-binary {
Expand Down Expand Up @@ -912,6 +947,16 @@ input.column-boolean {
.form-link {
display: none;
}

.form {
.form-container, .form-hcontainer, .form-vcontainer {
display: block;
}
}

.xalign-center, .xalign-end {
text-align: start;
}
}

@media screen and (max-width: @screen-xs-max) {
Expand Down
Loading