Skip to content

Commit c9061da

Browse files
committed
Remove reference to col--padded for spacing utilities for grid gutters
1 parent ebd2cb4 commit c9061da

File tree

4 files changed

+87
-46
lines changed

4 files changed

+87
-46
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
**Note**: The `<div>` with class `slds-box` is for demo purposes only.
2+
13
By default, the grid items within a `.{{cssPrefix}}grid` do not stretch to take up that available white-space on the main axis. Apply `.{{cssPrefix}}col` to a grid item, it will stretch across the main axis. The width of each grid item will be determined by the content within that region.
24

3-
To apply gutters between each grid item, the following classes are available to add your intended gutters, `.{{cssPrefix}}col--padded`, `.{{cssPrefix}}col--padded-medium` and `.{{cssPrefix}}col--padded-large`.
5+
To apply gutters between each grid item, the following spacing classes are available to add your intended gutters, `.{{cssPrefix}}p-horizontal--small`, `.{{cssPrefix}}p-horizontal--medium`, `.{{cssPrefix}}p-horizontal--large`, `.{{cssPrefix}}p-around--small`, `.{{cssPrefix}}p-around--medium` and `.{{cssPrefix}}p-horizontal--large`.
46

57
You may need to pull the grid items back to their original grid boundaries of the grid container, apply the classes `.{{cssPrefix}}grid--pull-padded`, `.{{cssPrefix}}grid--pull-padded-medium` or `.{{cssPrefix}}grid--pull-padded-large` to the `.{{cssPrefix}}grid`.

ui/utilities/grid/flavors/automatic-sizing/index.react.example.jsx

Lines changed: 67 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,71 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1111

1212
import React from 'react';
1313
import { prefix as pf } from 'app_modules/ui/util/component';
14+
//
15+
//
16+
// export const preview = (
17+
// <div className="demo-only demo-container">
18+
// <div className={pf('grid')}>
19+
// <div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
20+
// <div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
21+
// </div>
22+
//
23+
// <div className={pf('grid grid--pull-padded')} style={{marginTop: '2rem'}}>
24+
// <div className={pf('col--padded')}><div className={pf('box box--small theme--shade text-align--center')}>col--padded</div></div>
25+
// <div className={pf('col--padded')}><div className={pf('box box--small theme--shade text-align--center')}>col--padded</div></div>
26+
// </div>
27+
// </div>
28+
// );
29+
//
30+
// export const code = (
31+
// <div className="demo-only demo-container">
32+
// <div className={pf('grid')}>
33+
// <div className={pf('col')}>col</div>
34+
// <div className={pf('col')}>col</div>
35+
// </div>
36+
//
37+
// <div className={pf('grid grid--pull-padded')}>
38+
// <div className={pf('col--padded')}>col--padded</div>
39+
// <div className={pf('col--padded')}>col--padded</div>
40+
// </div>
41+
// </div>
42+
// );
1443

15-
16-
export const preview = (
17-
<div className="demo-only demo-container">
18-
<div className={pf('grid')}>
19-
<div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
20-
<div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
21-
</div>
22-
23-
<div className={pf('grid grid--pull-padded')} style={{marginTop: '2rem'}}>
24-
<div className={pf('col--padded')}><div className={pf('box box--small theme--shade text-align--center')}>col--padded</div></div>
25-
<div className={pf('col--padded')}><div className={pf('box box--small theme--shade text-align--center')}>col--padded</div></div>
26-
</div>
27-
</div>
28-
);
29-
30-
export const code = (
31-
<div className="demo-only demo-container">
32-
<div className={pf('grid')}>
33-
<div className={pf('col')}>col</div>
34-
<div className={pf('col')}>col</div>
35-
</div>
36-
37-
<div className={pf('grid grid--pull-padded')}>
38-
<div className={pf('col--padded')}>col--padded</div>
39-
<div className={pf('col--padded')}>col--padded</div>
40-
</div>
41-
</div>
42-
);
44+
export let states = [
45+
{
46+
id: 'stretch',
47+
label: 'Column Stretch',
48+
element:
49+
<div className={pf('grid')}>
50+
<div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
51+
<div className={pf('col')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
52+
</div>
53+
},
54+
{
55+
id: 'stretch-gutters',
56+
label: 'Column Stretch w/ Gutters',
57+
element:
58+
<div className={pf('grid grid--pull-padded-medium')}>
59+
<div className={pf('col p-horizontal--medium')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
60+
<div className={pf('col p-horizontal--medium')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
61+
</div>
62+
},
63+
{
64+
id: 'no-stretch',
65+
label: 'No Column Stretch',
66+
element:
67+
<div className={pf('grid')}>
68+
<div><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
69+
<div><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
70+
</div>
71+
},
72+
{
73+
id: 'no-stretch-gutters',
74+
label: 'No Column Stretch w/ Gutters',
75+
element:
76+
<div className={pf('grid grid--pull-padded-medium')}>
77+
<div className={pf('p-horizontal--medium')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
78+
<div className={pf('p-horizontal--medium')}><div className={pf('box box--small theme--shade text-align--center')}>col</div></div>
79+
</div>
80+
}
81+
];

ui/utilities/grid/flavors/manual-sizing/index.react.example.jsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ import { prefix as pf } from 'app_modules/ui/util/component';
1616
export const preview = (
1717
<div className="demo-only demo-container">
1818
<div className={pf('grid wrap grid--pull-padded')}>
19-
<div className={pf('col--padded size--1-of-1 p-bottom--large')}>
19+
<div className={pf('p-horizontal--small size--1-of-1 p-bottom--large')}>
2020
<div className={pf('box box--small theme--shade text-align--center')}>1</div>
2121
</div>
22-
<div className={pf('col--padded size--1-of-2 medium-size--5-of-6 large-size--8-of-12 p-bottom--large')}>
22+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--5-of-6 large-size--8-of-12 p-bottom--large')}>
2323
<div className={pf('box box--small theme--shade text-align--center')}>2</div>
2424
</div>
25-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-6 large-size--4-of-12 p-bottom--large')}>
25+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-6 large-size--4-of-12 p-bottom--large')}>
2626
<div className={pf('box box--small theme--shade text-align--center')}>3</div>
2727
</div>
28-
<div className={pf('col--padded size--1-of-1 medium-size--1-of-2 large-size--1-of-3 p-bottom--large')}>
28+
<div className={pf('p-horizontal--small size--1-of-1 medium-size--1-of-2 large-size--1-of-3 p-bottom--large')}>
2929
<div className={pf('box box--small theme--shade text-align--center')}>4</div>
3030
</div>
31-
<div className={pf('col--padded size--1-of-1 medium-size--1-of-2 large-size--1-of-3 p-bottom--large')}>
31+
<div className={pf('p-horizontal--small size--1-of-1 medium-size--1-of-2 large-size--1-of-3 p-bottom--large')}>
3232
<div className={pf('box box--small theme--shade text-align--center')}>5</div>
3333
</div>
34-
<div className={pf('col--padded size--1-of-1 large-size--1-of-3')}>
34+
<div className={pf('p-horizontal--small size--1-of-1 large-size--1-of-3')}>
3535
<div className={pf('grid wrap grid--pull-padded')}>
36-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-1 large-size--1-of-2 p-bottom--large')}>
36+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-1 large-size--1-of-2 p-bottom--large')}>
3737
<div className={pf('box box--small theme--shade text-align--center')}>6</div>
3838
</div>
39-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-1 large-size--1-of-2 p-bottom--large')}>
39+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-1 large-size--1-of-2 p-bottom--large')}>
4040
<div className={pf('box box--small theme--shade text-align--center')}>7</div>
4141
</div>
4242
</div>
@@ -48,15 +48,15 @@ export const preview = (
4848
export const code = (
4949
<div className="demo-only demo-container">
5050
<div className={pf('grid wrap grid--pull-padded')}>
51-
<div className={pf('col--padded size--1-of-1')}>1</div>
52-
<div className={pf('col--padded size--1-of-2 medium-size--5-of-6 large-size--8-of-12')}>2</div>
53-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-6 large-size--4-of-12')}>3</div>
54-
<div className={pf('col--padded size--1-of-1 medium-size--1-of-2 large-size--1-of-3')}>4</div>
55-
<div className={pf('col--padded size--1-of-1 medium-size--1-of-2 large-size--1-of-3')}>5</div>
56-
<div className={pf('col--padded size--1-of-1 large-size--1-of-3')}>
51+
<div className={pf('p-horizontal--small size--1-of-1')}>1</div>
52+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--5-of-6 large-size--8-of-12')}>2</div>
53+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-6 large-size--4-of-12')}>3</div>
54+
<div className={pf('p-horizontal--small size--1-of-1 medium-size--1-of-2 large-size--1-of-3')}>4</div>
55+
<div className={pf('p-horizontal--small size--1-of-1 medium-size--1-of-2 large-size--1-of-3')}>5</div>
56+
<div className={pf('p-horizontal--small size--1-of-1 large-size--1-of-3')}>
5757
<div className={pf('grid wrap grid--pull-padded')}>
58-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-1 large-size--1-of-2')}>6</div>
59-
<div className={pf('col--padded size--1-of-2 medium-size--1-of-1 large-size--1-of-2')}>7</div>
58+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-1 large-size--1-of-2')}>6</div>
59+
<div className={pf('p-horizontal--small size--1-of-2 medium-size--1-of-1 large-size--1-of-2')}>7</div>
6060
</div>
6161
</div>
6262
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
**Note** The `<div>` with class `slds-box` is for demo purposes only.
1+
**Note**: The `<div>` with class `slds-box` is for demo purposes only.

0 commit comments

Comments
 (0)