diff --git a/public/input/Inputs.jsx b/public/input/Inputs.jsx new file mode 100644 index 0000000..3ad1169 --- /dev/null +++ b/public/input/Inputs.jsx @@ -0,0 +1,28 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import Button from './button/Button'; + +export { + Button +}; diff --git a/public/page/home/Homepage.jsx b/public/page/home/Homepage.jsx index a8ccd76..1871c41 100644 --- a/public/page/home/Homepage.jsx +++ b/public/page/home/Homepage.jsx @@ -23,10 +23,10 @@ import React from 'react'; import Page from './../Page'; -import VideoSection from './../../section/video/VideoSection'; -import Section from './../../section/Section'; +import { Section, VideoSection } from './../../section/Sections'; import FloatingContentBox from './../../content/FloatingContentBox'; -import Button from './../../input/button/Button'; +import { Button } from './../../input/Inputs'; +import { Title, Subtitle } from './../../typography/Typography'; class Homepage extends React.Component { constructor(props) { @@ -37,9 +37,9 @@ class Homepage extends React.Component { return ( <Page style="home-page"> <VideoSection full> - <FloatingContentBox position="middle right" size="medium" className="u-text-right"> - <h1>My Cool Page</h1> - <p>Lorem ipsum dolor</p> + <FloatingContentBox position="middle right" size="medium" className="u-text-center"> + <Title>My Cool Page</Title> + <Subtitle>Lorem ipsum dolor</Subtitle> <Button>Hello</Button> </FloatingContentBox> </VideoSection> diff --git a/public/section/Sections.jsx b/public/section/Sections.jsx new file mode 100644 index 0000000..e4a466f --- /dev/null +++ b/public/section/Sections.jsx @@ -0,0 +1,30 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import Section from './Section'; +import VideoSection from './video/VideoSection'; + +export { + Section, + VideoSection +}; diff --git a/public/styles/index.scss b/public/styles/index.scss index 086abda..21e9acc 100644 --- a/public/styles/index.scss +++ b/public/styles/index.scss @@ -54,6 +54,7 @@ //Objects @import './objects/main.scss'; +@import './objects/title.scss'; @import './objects/_app.scss'; @import './objects/_button.scss'; diff --git a/public/styles/objects/title.scss b/public/styles/objects/title.scss new file mode 100644 index 0000000..b58cb35 --- /dev/null +++ b/public/styles/objects/title.scss @@ -0,0 +1,19 @@ +/* + * Title + * Title Headings + * + * Version: + * 1.0.0 - 2018/05/11 + */ +.o-title { + font-size: 3em; + margin-bottom: 0.25em; + + + .o-subtitle { + margin-top: 0em; + } +} + +.o-subtitle { + font-size: 1.2em; +} diff --git a/public/typography/Typography.jsx b/public/typography/Typography.jsx new file mode 100644 index 0000000..ffaa0bd --- /dev/null +++ b/public/typography/Typography.jsx @@ -0,0 +1,30 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import Title from './Title'; +import Subtitle from './Subtitle'; + +export { + Title, + Subtitle +}