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

feat: #9761 page heading and layout tweaks #9960

Merged
merged 2 commits into from
Oct 16, 2023
Merged

feat: #9761 page heading and layout tweaks #9960

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
202a695
feat: #9761 page heading and layout tweaks
willmcvay Oct 14, 2023
b66449a
feat: #9761 page heading and layout tweaks
willmcvay Oct 14, 2023
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
2 changes: 1 addition & 1 deletion packages/elements/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@reapit/elements",
"version": "3.12.0",
"version": "4.0.0-beta.4",
"description": "A collection of React components and utilities for building apps for Reapit Marketplace",
"homepage": "https://github.com/reapit/foundations#readme",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/src/components/grid/grid.stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Below 1024px the grid will have a single item per column, above, the screen will

## Basic Usage - Split Screen Grid Thirds

For a sidebar and main colum view, you can use a `GridThirds` grid, with `ColSplitThird` and `ColSplitTwoThirds` grid items - this is best combined with a `PageContainerMaxWidth` - see layouts for more on this.
For a sidebar and main colum view, you can use a `GridThirds` grid, with `ColSplitThird` and `ColSplitTwoThirds` grid items - this is best combined with a `hasMaxWidth` Container - see layouts for more on this.

In mobile and tablet, these columns stack then break at destop view and above.

Expand Down
23 changes: 17 additions & 6 deletions packages/elements/src/components/layout/__styles__/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { elHFull } from '../../../styles/sizing'
import { css } from '@linaria/core'

export const elHasGreyBackground = css``
export const elHasMaxWidth = css``

export const ElMainContainer = styled.main`
display: flex;
flex-direction: column;
width: 100vw;
width: 100%;
height: 100vh;
overflow-y: visible;
overflow-x: hidden;
Expand All @@ -17,6 +18,11 @@ export const ElMainContainer = styled.main`
&.${elHasGreyBackground} {
background: var(--color-grey-50);
}

&.${elHasMaxWidth} {
max-width: 1200px;
margin: 0 auto;
}
`

export const ElPageContainer = styled.section`
Expand All @@ -29,7 +35,7 @@ export const ElPageContainer = styled.section`
background-color: var(--color-white);

${isTablet} {
padding: 2rem 1.5rem;
padding: 2.5rem 1.5rem;
}

&.${elHFull} {
Expand All @@ -39,11 +45,11 @@ export const ElPageContainer = styled.section`
&.${elHasGreyBackground} {
background: var(--color-grey-50);
}
`

export const ElPageContainerMaxWidth = styled(ElPageContainer)`
max-width: 1200px;
margin: 0 auto;
&.${elHasMaxWidth} {
max-width: 1200px;
margin: 0 auto;
}
`

export const ElSecondaryNavContainer = styled.aside`
Expand Down Expand Up @@ -81,4 +87,9 @@ export const ElFlexContainer = styled.div`
&.${elHasGreyBackground} {
background: var(--color-grey-50);
}

&.${elHasMaxWidth} {
max-width: 1200px;
margin: 0 auto;
}
`
77 changes: 0 additions & 77 deletions packages/elements/src/components/layout/__tests__/__snapshots__/layout.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,83 +465,6 @@ exports[`PageContainer should match a snapshot and render children 1`] = `
}
`;

exports[`PageContainerMaxWidth should match a snapshot and render children 1`] = `
{
"asFragment": [Function],
"baseElement": <body>
<div>
<mock-styled.mock-styled.section
classname="mock-css."
>
<p>
I am child
</p>
</mock-styled.mock-styled.section>
</div>
</body>,
"container": <div>
<mock-styled.mock-styled.section
classname="mock-css."
>
<p>
I am child
</p>
</mock-styled.mock-styled.section>
</div>,
"debug": [Function],
"findAllByAltText": [Function],
"findAllByDisplayValue": [Function],
"findAllByLabelText": [Function],
"findAllByPlaceholderText": [Function],
"findAllByRole": [Function],
"findAllByTestId": [Function],
"findAllByText": [Function],
"findAllByTitle": [Function],
"findByAltText": [Function],
"findByDisplayValue": [Function],
"findByLabelText": [Function],
"findByPlaceholderText": [Function],
"findByRole": [Function],
"findByTestId": [Function],
"findByText": [Function],
"findByTitle": [Function],
"getAllByAltText": [Function],
"getAllByDisplayValue": [Function],
"getAllByLabelText": [Function],
"getAllByPlaceholderText": [Function],
"getAllByRole": [Function],
"getAllByTestId": [Function],
"getAllByText": [Function],
"getAllByTitle": [Function],
"getByAltText": [Function],
"getByDisplayValue": [Function],
"getByLabelText": [Function],
"getByPlaceholderText": [Function],
"getByRole": [Function],
"getByTestId": [Function],
"getByText": [Function],
"getByTitle": [Function],
"queryAllByAltText": [Function],
"queryAllByDisplayValue": [Function],
"queryAllByLabelText": [Function],
"queryAllByPlaceholderText": [Function],
"queryAllByRole": [Function],
"queryAllByTestId": [Function],
"queryAllByText": [Function],
"queryAllByTitle": [Function],
"queryByAltText": [Function],
"queryByDisplayValue": [Function],
"queryByLabelText": [Function],
"queryByPlaceholderText": [Function],
"queryByRole": [Function],
"queryByTestId": [Function],
"queryByText": [Function],
"queryByTitle": [Function],
"rerender": [Function],
"unmount": [Function],
}
`;

exports[`SecondaryNavContainer should match a snapshot and render children 1`] = `
{
"asFragment": [Function],
Expand Down
20 changes: 1 addition & 19 deletions packages/elements/src/components/layout/__tests__/layout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import React from 'react'
import { render } from '@testing-library/react'
import {
MainContainer,
PageContainer,
SecondaryNavContainer,
Molecule,
FlexContainer,
PageContainerMaxWidth,
} from '../index'
import { MainContainer, PageContainer, SecondaryNavContainer, Molecule, FlexContainer } from '../index'

describe('MainContainer', () => {
it('should match a snapshot and render children', () => {
Expand All @@ -31,17 +24,6 @@ describe('PageContainer', () => {
})
})

describe('PageContainerMaxWidth', () => {
it('should match a snapshot and render children', () => {
const wrapper = render(
<PageContainerMaxWidth hasGreyBackground>
<p>I am child</p>
</PageContainerMaxWidth>,
)
expect(wrapper).toMatchSnapshot()
})
})

describe('SecondaryNavContainer', () => {
it('should match a snapshot and render children', () => {
const wrapper = render(
Expand Down
Loading