diff --git a/public/assets/images/favicon/browserconfig.xml b/public/assets/images/favicon/browserconfig.xml deleted file mode 100644 index c554148..0000000 --- a/public/assets/images/favicon/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/public/assets/images/favicon/favicon.ico b/public/assets/images/favicon/favicon.ico deleted file mode 100644 index ecdd062..0000000 Binary files a/public/assets/images/favicon/favicon.ico and /dev/null differ diff --git a/public/components/page/Page.scss b/public/components/page/Page.scss index 65badcf..a634edc 100644 --- a/public/components/page/Page.scss +++ b/public/components/page/Page.scss @@ -32,7 +32,7 @@ } &__background { - position: absolute; + position: fixed; z-index: -1; width: 100%; height: 100%; diff --git a/public/components/section/Section.jsx b/public/components/section/Section.jsx index 8c13534..e678162 100644 --- a/public/components/section/Section.jsx +++ b/public/components/section/Section.jsx @@ -37,20 +37,3 @@ export default props => { return
; } - -import BodySection from './body/BodySection'; -import ClearSection from './layout/ClearSection'; -import ImageSection from './image/ImageSection'; -import BannerImageSection from './image/banner/BannerImageSection'; -import SplitSection, { Split } from './layout/SplitSection'; -import VideoSection from './video/VideoSection'; - -export { - BodySection, - ClearSection, - ImageSection, - BannerImageSection, - SplitSection, - Split, - VideoSection -} diff --git a/public/components/section/banner/BannerSection.jsx b/public/components/section/banner/BannerSection.jsx new file mode 100644 index 0000000..1c5955e --- /dev/null +++ b/public/components/section/banner/BannerSection.jsx @@ -0,0 +1,52 @@ +// 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 React from 'react'; +import Section from './../Section'; + +import { PageBoundary } from '@components/page/Page'; +import BoxSizer from '@objects/layout/BoxSizer'; + +import Styles from './BannerSection.scss'; + +export default props => { + let { className, width, height, children } = props; + + return ( +
+ {/* Mobile Box Sizer */} + + + {/* Desktop Box Sizer */} + + + +
+ ); +}; diff --git a/public/components/section/banner/BannerSection.scss b/public/components/section/banner/BannerSection.scss new file mode 100644 index 0000000..f7553af --- /dev/null +++ b/public/components/section/banner/BannerSection.scss @@ -0,0 +1,14 @@ +@import '~@styles/global'; + +.c-banner-section { + position: relative; + + &__sizer { + &.for-desktop {display: none;} + + @include t-media-query($s-small-up) { + &.for-mobile {display: none;} + &.for-desktop {display: block;} + } + } +} diff --git a/public/language/en-AU.jsx b/public/language/en-AU.jsx index ee29362..697a8f5 100644 --- a/public/language/en-AU.jsx +++ b/public/language/en-AU.jsx @@ -150,8 +150,7 @@ export default { Requiring a strong and versitile mobile browsing experience, as well as many fast and easy to use filtering systems to help search through their range to find the perfect fit for each pair - of underpants. I built on Shopify while working at - + of underpants. I built on Shopify while working at Process Creative

diff --git a/public/pages/blog/BlogPage.scss b/public/pages/blog/BlogPage.scss index d51acc5..4b01acc 100644 --- a/public/pages/blog/BlogPage.scss +++ b/public/pages/blog/BlogPage.scss @@ -6,7 +6,4 @@ * 1.0.0 - 2018/10/30 */ .p-blog-page { - .c-page__background { - position: fixed; - } } diff --git a/public/pages/contact/ContactPage.jsx b/public/pages/contact/ContactPage.jsx index 61c8b6a..6fae912 100644 --- a/public/pages/contact/ContactPage.jsx +++ b/public/pages/contact/ContactPage.jsx @@ -28,10 +28,13 @@ import { bindActionCreators } from 'redux'; //Actions import { openModal } from '@public/actions/ModalActions'; +//High Order Components +import { withLanguage } from '@public/language/Language'; + //Components import Page, { PageBoundary } from '@components/page/Page'; -import { withLanguage } from '@public/language/Language'; -import { ClearSection } from '@components/section/Section'; +import ClearSection from '@sections/layout/ClearSection'; +import ContactForm from './form/ContactForm'; //Objects import ElementScrollFader from '@objects/animation/fade/ElementScrollFader'; @@ -40,8 +43,6 @@ import { Title, Heading1, Paragraph } from '@objects/typography/Typography'; import Modal from '@objects/modal/Modal'; import { FormManager } from '@objects/input/Input'; -import ContactForm from './form/ContactForm'; - import Styles from './ContactPage.scss'; class ContactPage extends React.Component { diff --git a/public/pages/error/ErrorPage.jsx b/public/pages/error/ErrorPage.jsx index 50872a3..b10ac07 100644 --- a/public/pages/error/ErrorPage.jsx +++ b/public/pages/error/ErrorPage.jsx @@ -25,7 +25,7 @@ import React from 'react'; import { withLanguage} from '@public/language/Language'; import Page, { PageBoundary } from '@components/page/Page'; -import { ClearSection } from '@components/section/Section'; +import ClearSection from '@sections/layout/ClearSection'; import ErrorSection from '@sections/error/ErrorSection'; import { Title } from '@objects/typography/Typography'; diff --git a/public/pages/home/HomePage.jsx b/public/pages/home/HomePage.jsx index 9b7161d..fc09281 100644 --- a/public/pages/home/HomePage.jsx +++ b/public/pages/home/HomePage.jsx @@ -23,8 +23,6 @@ import React from 'react'; -import Styles from './HomePage.scss'; - import Page from '@components/page/Page'; import BannerSection from './sections/BannerSection'; import PromoVideoSection from './sections/PromoVideoSection'; @@ -32,10 +30,17 @@ import ProgrammingSection from './sections/ProgrammingSection'; import PlatformsSection from './sections/PlatformsSection'; import ExistingWorkSection from './sections/ExistingWorkSection'; +import Styles from './HomePage.scss'; + export default props => { //Return return ( - + { /* Banner */ } diff --git a/public/pages/home/HomePage.scss b/public/pages/home/HomePage.scss index 9586c82..22f25f2 100644 --- a/public/pages/home/HomePage.scss +++ b/public/pages/home/HomePage.scss @@ -18,7 +18,7 @@ } &__promo { - padding: 8em 0; + padding: 4em 0; background-size: 150% auto; &-video { diff --git a/public/pages/home/sections/BannerSection.jsx b/public/pages/home/sections/BannerSection.jsx index 31d90bc..c60d129 100644 --- a/public/pages/home/sections/BannerSection.jsx +++ b/public/pages/home/sections/BannerSection.jsx @@ -23,8 +23,10 @@ import React from 'react'; import { withLanguage } from '@public/language/Language'; + import { PageBoundary } from '@components/page/Page'; -import { BannerImageSection } from '@sections/Section'; +import BannerSection from '@sections/banner/BannerSection'; + import FloatingContentBox from '@objects/content/box/FloatingContentBox'; import { Title, Subtitle } from '@objects/typography/Typography'; @@ -33,18 +35,11 @@ export default withLanguage(props => { let { lang } = props; return ( - - - - { lang.pages.home.banner.title } - { lang.pages.home.banner.subtitle } - - - + + + { lang.pages.home.banner.title } + { lang.pages.home.banner.subtitle } + + ); }); diff --git a/public/pages/home/sections/ExistingWorkSection.jsx b/public/pages/home/sections/ExistingWorkSection.jsx index 9ccbd29..879f16f 100644 --- a/public/pages/home/sections/ExistingWorkSection.jsx +++ b/public/pages/home/sections/ExistingWorkSection.jsx @@ -23,8 +23,12 @@ import React from 'react'; import { withLanguage } from '@public/language/Language'; + import { PageBoundary } from '@components/page/Page'; -import { ImageSection, SplitSection, Split, ClearSection } from '@components/section/Section'; +import Section from '@sections/Section'; +import SplitSection, { Split } from '@sections/layout/SplitSection'; +import ClearSection from '@sections/layout/ClearSection'; + import ContentBox from '@objects/content/box/ContentBox'; import { Title, Subtitle, Paragraph, Heading1, Heading2 } from '@objects/typography/Typography'; import { Button } from '@objects/input/Input'; @@ -111,12 +115,7 @@ export default withLanguage(props => { let { lang } = props; return ( - +
{/* Title */} @@ -191,6 +190,6 @@ export default withLanguage(props => { {/* Space a bit */} - +
); }); diff --git a/public/pages/home/sections/PlatformsSection.jsx b/public/pages/home/sections/PlatformsSection.jsx index 1f1be41..6299f5e 100644 --- a/public/pages/home/sections/PlatformsSection.jsx +++ b/public/pages/home/sections/PlatformsSection.jsx @@ -22,9 +22,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import React from 'react'; + import { withLanguage } from '@public/language/Language'; + import { PageBoundary } from '@components/page/Page'; -import { ImageSection, SplitSection, Split } from '@components/section/Section'; +import Section from '@sections/Section'; +import SplitSection, { Split } from '@sections/layout/SplitSection'; + import FloatingContentBox from '@objects/content/box/FloatingContentBox'; import ContentBox from '@objects/content/box/ContentBox'; import Image from '@objects/image/Image'; @@ -54,12 +58,7 @@ const Platform = props => { export default withLanguage(props => { let { lang } = props; return ( - +
@@ -186,6 +185,6 @@ export default withLanguage(props => { </Subtitle> </ElementScrollFader> </PageBoundary> - </ImageSection> + </Section> ); }); diff --git a/public/pages/home/sections/ProgrammingSection.jsx b/public/pages/home/sections/ProgrammingSection.jsx index e333697..dee6217 100644 --- a/public/pages/home/sections/ProgrammingSection.jsx +++ b/public/pages/home/sections/ProgrammingSection.jsx @@ -24,31 +24,30 @@ import React from 'react'; import { connect } from 'react-redux'; import { withLanguage } from '@public/language/Language'; + import { PageBoundary } from '@components/page/Page'; -import { ImageSection } from '@components/section/Section'; +import Section from '@sections/Section'; + import ContentBox from '@objects/content/box/ContentBox'; import { Title, Paragraph, Heading1 } from '@objects/typography/Typography'; import ElementScrollFader from '@objects/animation/fade/ElementScrollFader'; export default withLanguage(props => { let { lang } = props; + let l = lang.pages.home.programming; + return ( - <ImageSection - className="p-home-page__promo p-home-page__promo-programming" - src={ require('@assets/images/patterns/florida.svg') } - loadable - background - > + <Section className="p-home-page__promo p-home-page__promo-programming"> <PageBoundary small> <ElementScrollFader from="bottom"> <ContentBox box> <Heading1 className="u-text-center"> - { lang.pages.home.programming.heading } + { l.heading } </Heading1> - { lang.pages.home.programming.paragraph } + { l.paragraph } </ContentBox> </ElementScrollFader> </PageBoundary> - </ImageSection> + </Section> ); }); diff --git a/public/pages/home/sections/PromoVideoSection.jsx b/public/pages/home/sections/PromoVideoSection.jsx index 729d969..af15ffe 100644 --- a/public/pages/home/sections/PromoVideoSection.jsx +++ b/public/pages/home/sections/PromoVideoSection.jsx @@ -23,8 +23,11 @@ import React from 'react'; import { withLanguage } from '@public/language/Language'; + import Page, { PageBoundary } from '@components/page/Page'; -import Section, { SplitSection, Split } from '@components/section/Section'; +import Section from '@sections/Section'; +import SplitSection, { Split } from '@sections/layout/SplitSection'; + import ContentBox from '@objects/content/box/ContentBox'; import FloatingContentBox from '@objects/content/box/FloatingContentBox'; import Video from '@objects/video/Video'; diff --git a/public/pages/legal/privacy/PrivacyPolicyPage.jsx b/public/pages/legal/privacy/PrivacyPolicyPage.jsx index ac65a69..1515e7b 100644 --- a/public/pages/legal/privacy/PrivacyPolicyPage.jsx +++ b/public/pages/legal/privacy/PrivacyPolicyPage.jsx @@ -26,7 +26,8 @@ import { connect } from 'react-redux'; import { withLanguage } from '@public/language/Language'; import Page, { PageBoundary } from '@components/page/Page'; -import { BodySection, ClearSection } from '@components/section/Section'; +import BodySection from '@sections/body/BodySection'; +import ClearSection from '@sections/layout/ClearSection'; import { Title } from '@objects/typography/Typography';