-
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
Merged
+2,189
−497
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
4d9c296
feat(grid, row, col): add recipe and tokens
thetaPC a9ee966
feat(row): migrate to Modular Ionic
thetaPC 0dbab18
feat(col): adjustable custom cols
thetaPC 4d2d35f
Merge branch 'ionic-modular' of github.com:ionic-team/ionic-framework…
thetaPC bd3aba8
refactor(many): cleanup
thetaPC 896b5ea
docs(BREAKING): add latest for grid, col, and row
thetaPC 1450792
test(many): move away from ion-grid
thetaPC b96af96
test(loading): remove comment
thetaPC cd6678a
docs(col, content): add resize debounce comment
thetaPC 4b31f33
test(col): update title
thetaPC c020275
test(col): add todo
thetaPC 7fb5865
test(col): update to be a comment
thetaPC 378fb76
test(grid): rename test
thetaPC c881b5a
docs(BREAKING): update push/pull section
thetaPC 789fb43
test(grid): split sizes
thetaPC b215bb3
test(grid): split offsets
thetaPC e6869a8
test(grid): update offsets tests
thetaPC 6703be0
test(grid): update sizes tests
thetaPC b893f5c
test(grid): update test order
thetaPC 2a796a1
test(grid): update padding tests
thetaPC 52c3618
test(grid): use setContent for basic
thetaPC 5df838d
test(grid): use setContent for offsets
thetaPC cd926e1
test(grid): use setContent for padding
thetaPC 6ccf913
test(grid): use setContent for sizes
thetaPC 100f846
test(toast): update snapshots
thetaPC File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-10.3 KB
(80%)
...sheet.e2e.ts-snapshots/action-sheet-translucent-ios-ltr-Mobile-Chrome-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+595 Bytes
(100%)
...heet.e2e.ts-snapshots/action-sheet-translucent-ios-ltr-Mobile-Firefox-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-58 Bytes
(100%)
...sheet.e2e.ts-snapshots/action-sheet-translucent-ios-ltr-Mobile-Safari-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 replaced
ion-gridto native grid so we don't have to always update snapshots ifion-gridchanged.