From e351a7dd7439d65b47321c9ce18e661da67929ee Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Mon, 1 Oct 2018 10:34:11 -0230 Subject: Switch page-container__footer-* for header and footer tags --- ui/app/components/page-container/index.scss | 42 +++++++++++----------- .../page-container-footer.component.js | 8 ++--- .../tests/page-container-footer.component.test.js | 4 +-- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'ui/app/components') diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss index b7bf1b8b5..6742e3082 100644 --- a/ui/app/components/page-container/index.scss +++ b/ui/app/components/page-container/index.scss @@ -52,29 +52,29 @@ .btn-confirm { font-size: 1rem; } - } - &__footer-header { - display: flex; - flex-flow: row; - justify-content: center; - padding: 16px; - flex: 0 0 auto; - } - - &__footer-footer { - display: flex; - flex-flow: row; - justify-content: space-around; - padding: 0 16px 16px; - flex: 0 0 auto; + header { + display: flex; + flex-flow: row; + justify-content: center; + padding: 16px; + flex: 0 0 auto; + } - a, a:hover { - text-decoration: none; - cursor: pointer; - font-size: 0.75rem; - text-transform: uppercase; - color: #2f9ae0; + footer { + display: flex; + flex-flow: row; + justify-content: space-around; + padding: 0 16px 16px; + flex: 0 0 auto; + + a, a:hover { + text-decoration: none; + cursor: pointer; + font-size: 0.75rem; + text-transform: uppercase; + color: #2f9ae0; + } } } diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js index 5e99d2a26..773fe1f56 100644 --- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js +++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js @@ -32,7 +32,7 @@ export default class PageContainerFooter extends Component { return (
-
+
-
+ {children && ( -
+
{children} -
+ )}
diff --git a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js index 75ee09fba..64efabab0 100644 --- a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js +++ b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js @@ -25,7 +25,7 @@ describe('Page Footer', () => { assert.equal(wrapper.find('.page-container__footer').length, 1) }) - it('should render a page-container__footer-footer class when given children', () => { + it('should render a footer inside page-container__footer when given children', () => { const wrapper = shallow(
Works
@@ -33,7 +33,7 @@ describe('Page Footer', () => { { context: { t: sinon.spy((k) => `[${k}]`) } } ) - assert.equal(wrapper.find('.page-container__footer-footer').length, 1) + assert.equal(wrapper.find('.page-container__footer footer').length, 1) }) it('renders two button components', () => { -- cgit