-
Notifications
You must be signed in to change notification settings - Fork 13.4k
feat(grid, row, col): add recipe and tokens #31189
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.
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
Changes from 8 commits
4d9c296
a9ee966
0dbab18
4d2d35f
bd3aba8
896b5ea
1450792
b96af96
cd6678a
4b31f33
c020275
7fb5865
378fb76
c881b5a
789fb43
b215bb3
e6869a8
6703be0
b893f5c
2a796a1
52c3618
5df838d
cd926e1
6ccf913
100f846
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I replaced |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,10 +14,16 @@ | |
| <script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script> | ||
|
|
||
| <style> | ||
| f { | ||
| display: block; | ||
| width: 100%; | ||
| .color-grid { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I replaced |
||
| display: grid; | ||
| grid-template-columns: repeat(3, 1fr); | ||
| } | ||
|
|
||
| .color-block { | ||
| height: 150px; | ||
|
|
||
| border: 5px solid transparent; | ||
| background-clip: padding-box; | ||
| } | ||
|
|
||
| .red { | ||
|
|
@@ -77,19 +83,17 @@ | |
| <button class="expand" id="scrollWithoutCancel" onclick="presentScrollNoCancel()">Scroll Without Cancel</button> | ||
| <button class="expand" id="cancelOnly" onclick="presentCancelOnly()">Cancel Only</button> | ||
|
|
||
| <ion-grid> | ||
| <ion-row> | ||
| <ion-col size="4"><f class="red"></f></ion-col> | ||
| <ion-col size="4"><f class="green"></f></ion-col> | ||
| <ion-col size="4"><f class="blue"></f></ion-col> | ||
| <ion-col size="4"><f class="yellow"></f></ion-col> | ||
| <ion-col size="4"><f class="pink"></f></ion-col> | ||
| <ion-col size="4"><f class="purple"></f></ion-col> | ||
| <ion-col size="4"><f class="black"></f></ion-col> | ||
| <ion-col size="4"><f class="fuchsia"></f></ion-col> | ||
| <ion-col size="4"><f class="orange"></f></ion-col> | ||
| </ion-row> | ||
| </ion-grid> | ||
| <div class="color-grid"> | ||
| <div class="color-block red"></div> | ||
| <div class="color-block green"></div> | ||
| <div class="color-block blue"></div> | ||
| <div class="color-block yellow"></div> | ||
| <div class="color-block pink"></div> | ||
| <div class="color-block purple"></div> | ||
| <div class="color-block black"></div> | ||
| <div class="color-block fuchsia"></div> | ||
| <div class="color-block orange"></div> | ||
| </div> | ||
| </ion-content> | ||
| <ion-action-sheet-controller></ion-action-sheet-controller> | ||
| </ion-app> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import type { IonPadding } from '../../themes/themes.interfaces'; | ||
| import { ION_GRID_BREAKPOINTS } from '../grid/grid.interface'; | ||
|
|
||
| export type IonColRecipe = { | ||
| breakpoint?: { | ||
| [K in IonColBreakpoint]?: { | ||
| padding?: IonPadding; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| // TODO(FW-7285): Replace with global breakpoints | ||
| export const ION_COL_BREAKPOINTS = ION_GRID_BREAKPOINTS; | ||
| export type IonColBreakpoint = (typeof ION_COL_BREAKPOINTS)[number]; | ||
|
|
||
| export type IonColProperty = 'size' | 'order' | 'offset'; | ||
|
|
||
| export type IonColStyle = { | ||
| '--internal-col-margin'?: string; | ||
| '--internal-col-span'?: string; | ||
|
brandyscarney marked this conversation as resolved.
|
||
| order?: string; | ||
| }; | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"no longer work" - is this accurate? It isn't "deprecated" if they don't work.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just copied it from the previous version but I've updated it: c881b5a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to fix it if they don't work at all, that's not deprecation. If push or pull is set it should change to offset.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FW-7565 created!