Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(core): layout grid issues #8136

Merged
merged 2 commits into from
May 28, 2022
Merged

fix(core): layout grid issues #8136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f7a520
chore(core,platform): styles bump to version 0.24.0-rc.102
platon-rov May 24, 2022
aaa3ee3
fix(core): layout grid
platon-rov May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions ...src/app/core/component-docs/layout-grid/examples/layout-grid-basic-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<fd-layout-grid>
<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
platon-rov marked this conversation as resolved.
Show resolved Hide resolved
<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
18 changes: 10 additions & 8 deletions ...c/app/core/component-docs/layout-grid/examples/layout-grid-growing-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<fd-layout-grid>
<div fdLayoutGridCol colGrow>
<example-layout-grid-block>Growing column</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="5">
<example-layout-grid-block>Size: 5</example-layout-grid-block>
</div>
<div fdLayoutGridCol colGrow>
<example-layout-grid-block>Growing column</example-layout-grid-block>
<div fdLayoutGridRow>
<div fdLayoutGridCol colGrow>
<example-layout-grid-block>Growing column</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="5">
<example-layout-grid-block>Size: 5</example-layout-grid-block>
</div>
<div fdLayoutGridCol colGrow>
<example-layout-grid-block>Growing column</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
118 changes: 62 additions & 56 deletions ...rc/app/core/component-docs/layout-grid/examples/layout-grid-no-gap-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,87 @@
<fd-layout-grid [noGap]="true">
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>

<br /><br /><br />

<fd-layout-grid [noHorizontalGap]="true">
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>

<br /><br /><br />

<fd-layout-grid [noVerticalGap]="true">
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="6">
<example-layout-grid-block>Size: 6</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="8">
<example-layout-grid-block>Size: 8</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
60 changes: 31 additions & 29 deletions ...rc/app/core/component-docs/layout-grid/examples/layout-grid-offset-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
<fd-layout-grid>
<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="2">
<example-layout-grid-block>Size: 2</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4" [colOffset]="2">
<example-layout-grid-block>
Size: 3 <br />
Offset: 2
</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4" [colOffset]="2">
<example-layout-grid-block>
Size: 3 <br />
Offset: 2
</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="2" [colOffset]="2">
<example-layout-grid-block>
Size: 2 <br />
Offset: 2
</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="2" [colOffset]="2">
<example-layout-grid-block>
Size: 2 <br />
Offset: 2
</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="2" [colOffset]="1">
<example-layout-grid-block>
Size: 2 <br />
Offset: 1
</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="2" [colOffset]="1">
<example-layout-grid-block>
Size: 2 <br />
Offset: 1
</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4" [colOffset]="1">
<example-layout-grid-block>
Size: 4 <br />
Offset: 1
</example-layout-grid-block>
<div [fdLayoutGridCol]="4" [colOffset]="1">
<example-layout-grid-block>
Size: 4 <br />
Offset: 1
</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
24 changes: 13 additions & 11 deletions ...pp/core/component-docs/layout-grid/examples/layout-grid-responsive-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<fd-layout-grid>
<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>
<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
<div [fdLayoutGridCol]="12" [colMd]="6" [colLg]="4" [colXl]="3">
<example-layout-grid-block>Sm: 12, Md: 6, Lg: 4, Xl: 3</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
12 changes: 7 additions & 5 deletions .../component-docs/layout-grid/examples/layout-grid-responsive-offset-example.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<fd-layout-grid>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
<div fdLayoutGridRow>
<div [fdLayoutGridCol]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>

<div [fdLayoutGridCol]="4" [colOffsetMd]="1" [colOffsetLg]="2" [colOffsetXl]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
<div [fdLayoutGridCol]="4" [colOffsetMd]="1" [colOffsetLg]="2" [colOffsetXl]="4">
<example-layout-grid-block>Size: 4</example-layout-grid-block>
</div>
</div>
</fd-layout-grid>
Loading