Skip to content

Commit 633ef16

Browse files
committed
Refactor containerFluidMargin to containerFluidPadding, update variable usage, and adjust related styles and documentation.
1 parent 5439d2e commit 633ef16

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const gridTheme: IGridSetting = {
8080
// xs: '1rem',
8181
// lg: '40px',
8282
// },
83-
containerFluidMargin: '40px',
83+
containerFluidPadding: '40px',
8484
// containerFluidMargin: {
8585
// xs: '40px',
8686
// lg: '80px',

src/GridSystem/Container/utils.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ export const createFluidBreakpoint = (props: TStyledProps<IContainerProps>) => {
1818

1919
if(typeof containerFluidMargin === 'string'){
2020
return `
21-
margin-left: ${containerFluidMargin};
22-
margin-right: ${containerFluidMargin};
21+
--acrool-container-fluid-padding: ${containerFluidMargin};
2322
`;
2423
}
2524

@@ -29,14 +28,12 @@ export const createFluidBreakpoint = (props: TStyledProps<IContainerProps>) => {
2928
if(rwdContainerFluidMargin){
3029
if(sizeName === 'xs'){
3130
return curr.concat(`
32-
margin-left: ${rwdContainerFluidMargin};
33-
margin-right: ${rwdContainerFluidMargin};
31+
--acrool-container-fluid-padding: ${rwdContainerFluidMargin};
3432
`);
3533
}
3634

3735
return curr.concat(media[sizeName]`
38-
margin-left: ${rwdContainerFluidMargin};
39-
margin-right: ${rwdContainerFluidMargin};
36+
--acrool-container-fluid-padding: ${rwdContainerFluidMargin};
4037
`);
4138
}
4239

src/styles.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,11 @@ $directions: (
260260
margin-left: auto;
261261
padding-right: calc(var(--acrool-gutter-x) * 0.5);
262262
padding-left: calc(var(--acrool-gutter-x) * 0.5);
263+
264+
&[data-class="container-fluid"]{
265+
padding-right: calc((var(--acrool-gutter-x) * 0.5) + var(--acrool-container-fluid-padding, 0));
266+
padding-left: calc((var(--acrool-gutter-x) * 0.5) + var(--acrool-container-fluid-padding, 0));
267+
}
263268
}
264269

265270
[data-grid="row"]{

0 commit comments

Comments
 (0)