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(pageHeader): issues/305 add bottom margin to h1 #357

Merged
merged 1 commit into from
Jul 30, 2020
Merged

fix(pageHeader): issues/305 add bottom margin to h1 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@patternfly/react-styles": "4.5.0",
"@patternfly/react-table": "4.12.1",
"@patternfly/react-tokens": "4.6.0",
"@redhat-cloud-services/frontend-components": "2.3.1",
"@redhat-cloud-services/frontend-components": "2.3.11",
"@redhat-cloud-services/frontend-components-notifications": "2.1.1",
"@redhat-cloud-services/frontend-components-utilities": "2.1.0",
"axios": "^0.19.2",
Expand Down
5 changes: 3 additions & 2 deletions src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,17 @@ exports[`Authentication Component should render a non-connected component error:
widget-type="InsightsPageHeader"
>
<PageHeaderTitle
className="pf-u-mb-sm"
title="Subscription Watch"
>
<Title
className=""
className="pf-u-mb-sm"
headingLevel="h1"
size="2xl"
widget-type="InsightsPageHeaderTitle"
>
<h1
className="pf-c-title pf-m-2xl"
className="pf-c-title pf-m-2xl pf-u-mb-sm"
widget-type="InsightsPageHeaderTitle"
>

Expand Down
15 changes: 9 additions & 6 deletions src/components/pageLayout/__tests__/__snapshots__/pageHeader.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ exports[`PageHeader Component should render a basic component: basic 1`] = `
widget-type="InsightsPageHeader"
>
<PageHeaderTitle
className="pf-u-mb-sm"
title={
<span
className="test"
Expand All @@ -19,13 +20,13 @@ exports[`PageHeader Component should render a basic component: basic 1`] = `
}
>
<Title
className=""
className="pf-u-mb-sm"
headingLevel="h1"
size="2xl"
widget-type="InsightsPageHeaderTitle"
>
<h1
className="pf-c-title pf-m-2xl"
className="pf-c-title pf-m-2xl pf-u-mb-sm"
widget-type="InsightsPageHeaderTitle"
>

Expand Down Expand Up @@ -53,16 +54,17 @@ exports[`PageHeader Component should render string node types: string 1`] = `
widget-type="InsightsPageHeader"
>
<PageHeaderTitle
className="pf-u-mb-sm"
title="dolor sit"
>
<Title
className=""
className="pf-u-mb-sm"
headingLevel="h1"
size="2xl"
widget-type="InsightsPageHeaderTitle"
>
<h1
className="pf-c-title pf-m-2xl"
className="pf-c-title pf-m-2xl pf-u-mb-sm"
widget-type="InsightsPageHeaderTitle"
>

Expand All @@ -86,16 +88,17 @@ exports[`PageHeader Component should render the subtitle when viewId is provided
widget-type="InsightsPageHeader"
>
<PageHeaderTitle
className="pf-u-mb-sm"
title="lorem"
>
<Title
className=""
className="pf-u-mb-sm"
headingLevel="h1"
size="2xl"
widget-type="InsightsPageHeaderTitle"
>
<h1
className="pf-c-title pf-m-2xl"
className="pf-c-title pf-m-2xl pf-u-mb-sm"
widget-type="InsightsPageHeaderTitle"
>

Expand Down
5 changes: 3 additions & 2 deletions src/components/pageLayout/__tests__/__snapshots__/pageLayout.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@ exports[`PageLayout Component should render header and section children: multipl
widget-type="InsightsPageHeader"
>
<PageHeaderTitle
className="pf-u-mb-sm"
title="lorem"
>
<Title
className=""
className="pf-u-mb-sm"
headingLevel="h1"
size="2xl"
widget-type="InsightsPageHeaderTitle"
>
<h1
className="pf-c-title pf-m-2xl"
className="pf-c-title pf-m-2xl pf-u-mb-sm"
widget-type="InsightsPageHeaderTitle"
>

Expand Down
2 changes: 1 addition & 1 deletion src/components/pageLayout/pageHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { translate } from '../i18n/i18n';
*/
const PageHeader = ({ children, viewId }) => (
<RcsPageHeader>
<PageHeaderTitle title={children} />
<PageHeaderTitle title={children} className="pf-u-mb-sm" />
{viewId && (
<p>
{translate(`curiosity-view.${viewId}Subtitle`, {}, [
Expand Down
0 src/styles/_common.scss → src/styles/_fade.scss
View file
Open in desktop
File renamed without changes.
0 src/styles/_app.scss → src/styles/_page-layout.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/

// App
@import 'app';
@import 'common';
@import 'page-layout';
@import 'fade';
@import 'optin';
@import 'usage-graph';
@import 'tour';
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,10 +1619,10 @@
commander ">=2.20.0"
react-content-loader ">=3.4.1"

"@redhat-cloud-services/frontend-components@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components/-/frontend-components-2.3.1.tgz#63ee52f53c2fbbc2cceb5a32398a86602240f22e"
integrity sha512-woo9ajFqjcRoC5+Y3QU04JIXgzX4SkiIxRO5UFe8AC310g8n+ec1jZDI+OFxaeupGULaOP53BqVzRrZUBoadKg==
"@redhat-cloud-services/frontend-components@2.3.11":
version "2.3.11"
resolved "https://registry.yarnpkg.com/@redhat-cloud-services/frontend-components/-/frontend-components-2.3.11.tgz#1761687b4a46b894a47493b848abb3064ca4cb83"
integrity sha512-EHw+u7/1MZkfpvyqaiyIblxI4Rsh1osGfZUwPm7hiJAOMOUCnpk1jrrzSiC6QORuiAUJ0aSnCRgVAnb3RduPxw==
dependencies:
"@redhat-cloud-services/frontend-components-utilities" "*"
sanitize-html "^1.25.0"
Expand Down