Skip to content

Commit

Permalink
Use align-items: center instead of .m12
Browse files Browse the repository at this point in the history
  • Loading branch information
zoglo committed May 17, 2024
2 parents bd40431 + 8ab3b5a commit 00c3545
Show file tree
Hide file tree
Showing 33 changed files with 52 additions and 66 deletions.
2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/backend.5e009704.css

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/backend.9204935f.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/confirm.330dd2c3.css

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/confirm.59938df3.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/conflict.9dbb4665.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/conflict.dc0fcdc7.css

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/diff.75992dae.css

This file was deleted.

1 change: 0 additions & 1 deletion core-bundle/contao/themes/flexible/diff.75992dae.css.map

This file was deleted.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/diff.d5725281.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core-bundle/contao/themes/flexible/diff.d5725281.css.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions core-bundle/contao/themes/flexible/entrypoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@
"entrypoints": {
"backend": {
"css": [
"/system/themes/flexible/backend.5e009704.css"
"/system/themes/flexible/backend.9204935f.css"
]
},
"confirm": {
"css": [
"/system/themes/flexible/confirm.330dd2c3.css"
"/system/themes/flexible/confirm.59938df3.css"
]
},
"conflict": {
"css": [
"/system/themes/flexible/conflict.dc0fcdc7.css"
"/system/themes/flexible/conflict.9dbb4665.css"
]
},
"diff": {
"css": [
"/system/themes/flexible/diff.75992dae.css"
"/system/themes/flexible/diff.d5725281.css"
]
},
"help": {
"css": [
"/system/themes/flexible/help.edf377ff.css"
"/system/themes/flexible/help.1acc36ef.css"
]
},
"login": {
"css": [
"/system/themes/flexible/login.f39bfb87.css"
"/system/themes/flexible/login.423dcfc9.css"
]
},
"popup": {
"css": [
"/system/themes/flexible/popup.75c000cb.css"
"/system/themes/flexible/popup.cdce2188.css"
]
},
"tinymce": {
Expand Down
2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/help.1acc36ef.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core-bundle/contao/themes/flexible/help.1acc36ef.css.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/help.edf377ff.css

This file was deleted.

1 change: 0 additions & 1 deletion core-bundle/contao/themes/flexible/help.edf377ff.css.map

This file was deleted.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/login.423dcfc9.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core-bundle/contao/themes/flexible/login.423dcfc9.css.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/login.f39bfb87.css

This file was deleted.

1 change: 0 additions & 1 deletion core-bundle/contao/themes/flexible/login.f39bfb87.css.map

This file was deleted.

28 changes: 14 additions & 14 deletions core-bundle/contao/themes/flexible/manifest.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"backend.css": "/system/themes/flexible/backend.5e009704.css",
"confirm.css": "/system/themes/flexible/confirm.330dd2c3.css",
"conflict.css": "/system/themes/flexible/conflict.dc0fcdc7.css",
"diff.css": "/system/themes/flexible/diff.75992dae.css",
"help.css": "/system/themes/flexible/help.edf377ff.css",
"login.css": "/system/themes/flexible/login.f39bfb87.css",
"popup.css": "/system/themes/flexible/popup.75c000cb.css",
"backend.css": "/system/themes/flexible/backend.9204935f.css",
"confirm.css": "/system/themes/flexible/confirm.59938df3.css",
"conflict.css": "/system/themes/flexible/conflict.9dbb4665.css",
"diff.css": "/system/themes/flexible/diff.d5725281.css",
"help.css": "/system/themes/flexible/help.1acc36ef.css",
"login.css": "/system/themes/flexible/login.423dcfc9.css",
"popup.css": "/system/themes/flexible/popup.cdce2188.css",
"tinymce.css": "/system/themes/flexible/tinymce.e5009f94.css",
"tinymce-dark.css": "/system/themes/flexible/tinymce-dark.596023db.css",
"backend.5e009704.css.map": "/system/themes/flexible/backend.5e009704.css.map",
"confirm.330dd2c3.css.map": "/system/themes/flexible/confirm.330dd2c3.css.map",
"conflict.dc0fcdc7.css.map": "/system/themes/flexible/conflict.dc0fcdc7.css.map",
"diff.75992dae.css.map": "/system/themes/flexible/diff.75992dae.css.map",
"help.edf377ff.css.map": "/system/themes/flexible/help.edf377ff.css.map",
"login.f39bfb87.css.map": "/system/themes/flexible/login.f39bfb87.css.map",
"popup.75c000cb.css.map": "/system/themes/flexible/popup.75c000cb.css.map",
"backend.9204935f.css.map": "/system/themes/flexible/backend.9204935f.css.map",
"confirm.59938df3.css.map": "/system/themes/flexible/confirm.59938df3.css.map",
"conflict.9dbb4665.css.map": "/system/themes/flexible/conflict.9dbb4665.css.map",
"diff.d5725281.css.map": "/system/themes/flexible/diff.d5725281.css.map",
"help.1acc36ef.css.map": "/system/themes/flexible/help.1acc36ef.css.map",
"login.423dcfc9.css.map": "/system/themes/flexible/login.423dcfc9.css.map",
"popup.cdce2188.css.map": "/system/themes/flexible/popup.cdce2188.css.map",
"tinymce.e5009f94.css.map": "/system/themes/flexible/tinymce.e5009f94.css.map",
"tinymce-dark.596023db.css.map": "/system/themes/flexible/tinymce-dark.596023db.css.map"
}
2 changes: 0 additions & 2 deletions core-bundle/contao/themes/flexible/popup.75c000cb.css

This file was deleted.

1 change: 0 additions & 1 deletion core-bundle/contao/themes/flexible/popup.75c000cb.css.map

This file was deleted.

2 changes: 2 additions & 0 deletions core-bundle/contao/themes/flexible/popup.cdce2188.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core-bundle/contao/themes/flexible/popup.cdce2188.css.map

Large diffs are not rendered by default.

30 changes: 8 additions & 22 deletions core-bundle/contao/themes/flexible/styles/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -358,22 +358,25 @@ fieldset > .widget-group {
display: grid;
gap: var(--widget-gap-rows) var(--widget-gap-cols);
grid-template-columns: repeat(var(--widget-col-amount), minmax(0, 1fr));
align-items: center;
}

.widget-group > * {
--widget-cols: var(--widget-col-amount);
grid-column-end: span var(--widget-cols);
}

.widget-group > .m12 {
margin: 0;
}

.widget-group > .clr, .widget-group > .subpal {
grid-column-start: 1;
}

/* Backwards compatibility */
*:not(.widget-group) > .widget {
margin-left: 15px;
margin-right: 15px;
position: relative;
}

*:not(.widget-group) > .w50 {
float: none;
width: calc(100% - 30px);
Expand Down Expand Up @@ -688,7 +691,7 @@ select[multiple] {

.tl_checkbox_single_container {
height: 16px;
margin: 14px 0 1px;
margin: 16px 0 1px;
}

.tl_checkbox_single_container label {
Expand Down Expand Up @@ -859,19 +862,6 @@ a.tl_submit {
width: 100%;
}

.m12 {
padding-top: 0;
padding-bottom: 0;
}

.nogrid .m12 {
padding: 0;
}

.cbx.m12 {
box-sizing: border-box;
}

.nogrid .cbx {
min-height: 32px;
}
Expand Down Expand Up @@ -956,10 +946,6 @@ a.tl_submit {
--widget-cols: 6;
}

.m12 {
padding: 18px 0 16px;
}

.tip {
max-width: 320px;
}
Expand Down

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

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

0 comments on commit 00c3545

Please sign in to comment.