Skip to content

Commit 0448019

Browse files
committed
Merge branch '4.x' into 5.x
* 4.x: Allow buttons to grow and wrap with long or multi-line content
2 parents a2aa224 + f74c134 commit 0448019

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

assets/css/easyadmin-theme/buttons.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
font-size: var(--button-font-size, .875rem);
2121
font-weight: var(--button-font-weight, 500);
2222
gap: var(--button-icon-gap, .5rem);
23-
block-size: var(--button-height, 2rem);
23+
min-block-size: var(--button-height, 2rem);
2424
justify-content: space-between;
2525
line-height: var(--button-line-height);
26-
min-inline-size: max-content;
2726
padding: var(--button-padding-y, var(--button-padding-y-md)) var(--button-padding-x, var(--button-padding-x-md));
2827
position: relative;
2928
text-align: center;
@@ -198,7 +197,7 @@
198197
--button-padding-y: var(--button-padding-y-lg);
199198
--button-padding-x: var(--button-padding-x-lg);
200199

201-
block-size: 2.5rem;
200+
min-block-size: 2.5rem;
202201
}
203202

204203
.btn-block {
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/entrypoints.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"entrypoints": {
33
"app": {
44
"css": [
5-
"/app.ef57b823.css"
5+
"/app.459a1f73.css"
66
],
77
"js": [
88
"/app.5145b767.js"

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"app.css": "app.ef57b823.css",
2+
"app.css": "app.459a1f73.css",
33
"app.js": "app.5145b767.js",
44
"form.js": "form.4f66b3e8.js",
55
"page-layout.js": "page-layout.6e9fe55d.js",

0 commit comments

Comments
 (0)