Skip to content

Commit f70b6eb

Browse files
committed
fix(container): consolidate fluid breakpoint styles and simplify padding calculation
1 parent 71d0ffd commit f70b6eb

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/GridSystem/Container/Container.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ const ContainerStd = styled.div<
1717
{ 'data-grid'?: string } & TStyledProps<IContainerStdProps>
1818
>`
1919
${props => css`
20-
${props.$fluid ?
21-
createFluidBreakpoint(props):
22-
createBreakpoint({theme: props.theme, fluid: props.$fluid} as TStyledProps<IContainerProps>)
23-
};
20+
${createFluidBreakpoint(props)}
21+
${createBreakpoint({theme: props.theme, fluid: props.$fluid} as TStyledProps<IContainerProps>)}
2422
`}
2523
`;
2624

src/styles.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,8 @@ $directions: (
258258
width: 100%;
259259
margin-right: auto;
260260
margin-left: auto;
261-
padding-right: calc(var(--acrool-gutter-x) * 0.5);
262-
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, 0px));
266-
padding-left: calc((var(--acrool-gutter-x) * 0.5) + var(--acrool-container-fluid-padding, 0px));
267-
}
261+
padding-right: calc((var(--acrool-gutter-x) * 0.5) + var(--acrool-container-fluid-padding, 0px));
262+
padding-left: calc((var(--acrool-gutter-x) * 0.5) + var(--acrool-container-fluid-padding, 0px));
268263
}
269264

270265
[data-grid="row"]{

0 commit comments

Comments
 (0)