Skip to content

Commit

Permalink
Merge branch 'master' into fix-19889
Browse files Browse the repository at this point in the history
  • Loading branch information
J-Sek authored May 27, 2024
2 parents 6d68bad + 2877f4f commit 392a1a1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
20 changes: 20 additions & 0 deletions packages/docs/src/pages/en/styles/flex.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,41 @@ Control the layout of flex containers with alignment, justification and more wit
| **flex-md-0-0** | flex: 0 0 auto; |
| **flex-lg-0-0** | flex: 0 0 auto; |
| **flex-xl-0-0** | flex: 0 0 auto; |
| **flex-1-1-0** | flex: 1 1 0%; |
| **flex-sm-1-1-0** | flex: 1 1 0%; |
| **flex-md-1-1-0** | flex: 1 1 0%; |
| **flex-lg-1-1-0** | flex: 1 1 0%; |
| **flex-xl-1-1-0** | flex: 1 1 0%; |
| **flex-1-1-100** | flex: 1 1 100%; |
| **flex-sm-1-1-100** | flex: 1 1 100%; |
| **flex-md-1-1-100** | flex: 1 1 100%; |
| **flex-lg-1-1-100** | flex: 1 1 100%; |
| **flex-xl-1-1-100** | flex: 1 1 100%; |
| **flex-1-0-0** | flex: 1 0 0%; |
| **flex-sm-1-0-0** | flex: 1 0 0%; |
| **flex-md-1-0-0** | flex: 1 0 0%; |
| **flex-lg-1-0-0** | flex: 1 0 0%; |
| **flex-xl-1-0-0** | flex: 1 0 0%; |
| **flex-1-0-100** | flex: 1 0 100%; |
| **flex-sm-1-0-100** | flex: 1 0 100%; |
| **flex-md-1-0-100** | flex: 1 0 100%; |
| **flex-lg-1-0-100** | flex: 1 0 100%; |
| **flex-xl-1-0-100** | flex: 1 0 100%; |
| **flex-0-1-0** | flex: 0 1 0%; |
| **flex-sm-0-1-0** | flex: 0 1 0%; |
| **flex-md-0-1-0** | flex: 0 1 0%; |
| **flex-lg-0-1-0** | flex: 0 1 0%; |
| **flex-xl-0-1-0** | flex: 0 1 0%; |
| **flex-0-1-100** | flex: 0 1 100%; |
| **flex-sm-0-1-100** | flex: 0 1 100%; |
| **flex-md-0-1-100** | flex: 0 1 100%; |
| **flex-lg-0-1-100** | flex: 0 1 100%; |
| **flex-xl-0-1-100** | flex: 0 1 100%; |
| **flex-0-0-0** | flex: 0 0 0% |
| **flex-sm-0-0-0** | flex: 0 0 0% |
| **flex-md-0-0-0** | flex: 0 0 0% |
| **flex-lg-0-0-0** | flex: 0 0 0% |
| **flex-xl-0-0-0** | flex: 0 0 0% |
| **flex-0-0-100** | flex: 0 0 100%; |
| **flex-sm-0-0-100** | flex: 0 0 100%; |
| **flex-md-0-0-100** | flex: 0 0 100%; |
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/plugins/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export {
mdiExport,
mdiExportVariant,
mdiEye,
mdiEyedropper,
mdiEyeOff,
mdiFacebook,
mdiFastForward,
Expand Down
6 changes: 5 additions & 1 deletion packages/vuetify/src/styles/settings/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ $utilities: () !default;
'1-1-100': 1 1 100%,
'1-0-100': 1 0 100%,
'0-1-100': 0 1 100%,
'0-0-100': 0 0 100%
'0-0-100': 0 0 100%,
'1-1-0': 1 1 0,
'1-0-0': 1 0 0,
'0-1-0': 0 1 0,
'0-0-0': 0 0 0,
)
),
"flex-direction": (
Expand Down

0 comments on commit 392a1a1

Please sign in to comment.