diff --git a/.lagoon.yml b/.lagoon.yml index 9430921..2526c6f 100644 --- a/.lagoon.yml +++ b/.lagoon.yml @@ -24,11 +24,14 @@ environments: - backend2019.texascamp.org - frontend: - "texascamp.org": - tls-acme: 'false' + tls-acme: 'true' + insecure: Redirect - "www.texascamp.org": - tls-acme: 'false' + tls-acme: 'true' + insecure: Redirect - "2019.texascamp.org": - tls-acme: 'false' + tls-acme: 'true' + insecure: Redirect cronjobs: - name: drush cron schedule: "H/15 * * * *" diff --git a/frontend/app/components/App/index.js b/frontend/app/components/App/index.js index c4f49c0..1ff9812 100644 --- a/frontend/app/components/App/index.js +++ b/frontend/app/components/App/index.js @@ -5,7 +5,6 @@ import 'App/normalize.css'; import React from 'react'; import Helmet from 'react-helmet'; import { Switch, Route } from 'react-router'; -import SplashPage from 'SplashPage'; import Home from 'Home'; import Sessions from 'Sessions'; import ProposedSessions from 'Sessions/Proposed'; @@ -44,60 +43,26 @@ const App = (): React.Element => - - - { - if (global.window) { - global.window.location.replace( - 'https://opencollective.com/drupalatx/events/texas-camp-2019-19178ev#tickets', - ); - } - - return ( - - ); - }} - /> - - (
- - - - - - - - - - - - - - -
)} - /> -
+
+ + + + + + + + + + + + + + +
); export default App; diff --git a/frontend/app/components/Footer/index.js b/frontend/app/components/Footer/index.js index 0721a61..cd5b0c5 100644 --- a/frontend/app/components/Footer/index.js +++ b/frontend/app/components/Footer/index.js @@ -5,6 +5,7 @@ import Sponsor from 'Sponsor'; import withSponsorsQuery from 'Sponsors/withSponsorsQuery'; import styles from './styles.css'; import logo from '../../shared/images/texas-camp-logo-blue.png'; +import logoCodeup from '../../shared/images/logo-codeup.png'; import twitter from '../../shared/images/twitter-grey.png'; import facebook from '../../shared/images/facebook-grey.png'; import sponsorsHeading from '../../shared/images/sponsors-heading-grey.png'; @@ -20,7 +21,6 @@ const Footer = ({ loading, sponsors }): React.Element | null =>   ·   San Antonio, TX -
CodeUp
@@ -32,6 +32,9 @@ const Footer = ({ loading, sponsors }): React.Element | null =>
+
+ +
+ venue + + ); +} + export default withSponsorsQuery(Footer); diff --git a/frontend/app/components/Footer/styles.css b/frontend/app/components/Footer/styles.css index 8f100d6..0039c74 100644 --- a/frontend/app/components/Footer/styles.css +++ b/frontend/app/components/Footer/styles.css @@ -11,7 +11,7 @@ } .info { color: $grey; - margin: 20px 0 40px; + margin: 20px 0 20px; .social { img { height: 14px; @@ -32,14 +32,16 @@ .heading { width: 140px; } -.sponsorsContainer { - display: flex; - justify-content: center; - img { - filter: grayscale(100%) brightness(240%); - -webkit-filter: grayscale(100%) brightness(240%); - margin: 20px 10px; - max-width: 160px; +.sponsors { + .sponsorsContainer { + display: flex; + justify-content: center; + img { + filter: grayscale(100%) brightness(240%); + -webkit-filter: grayscale(100%) brightness(240%); + margin: 20px 0; + max-width: 160px; + } } } .credits { @@ -47,8 +49,15 @@ color: $blue; font-size: 10px; padding: 20px; + padding-top: 0; + margin-top: -1em; text-align: center; a { color: $blue; } } +.venue { + img { + width: 160px; + } +} diff --git a/frontend/app/components/Header/index.js b/frontend/app/components/Header/index.js index f9b1b30..67f2ed7 100644 --- a/frontend/app/components/Header/index.js +++ b/frontend/app/components/Header/index.js @@ -58,7 +58,16 @@ const Header = ({ image = 'snake', isHome }) => {   ·   San Antonio, TX
-
CodeUp
+
+ + Codeup + +
diff --git a/frontend/app/components/Header/styles.css b/frontend/app/components/Header/styles.css index c40bf15..5ee9eb9 100644 --- a/frontend/app/components/Header/styles.css +++ b/frontend/app/components/Header/styles.css @@ -93,6 +93,12 @@ padding-top: 8px; } } + .venue { + a:hover { + border-bottom: 1px solid; + padding-top: 8px; + } + } } .logo { position: relative; @@ -225,7 +231,7 @@ :global .home { .snake { @media screen and (max-width: 500px) { - left: 50%; + left: 0; overflow: visible !important; position: absolute; } @@ -235,11 +241,11 @@ img { @media screen and (max-width: 500px) { background-color: $orange; - left: -50%; + left: 0; position: relative; } @media $tabletDown { - max-width: 500px !important; + max-width: 100vw !important; padding-top: 156px; } @media $tabletOnly { diff --git a/frontend/app/screens/Sponsors/index.js b/frontend/app/screens/Sponsors/index.js index a76c839..e255b05 100644 --- a/frontend/app/screens/Sponsors/index.js +++ b/frontend/app/screens/Sponsors/index.js @@ -70,7 +70,7 @@ const Sponsors = ({
  • Join our{' '} - + Open Collective {' '} to submit funds diff --git a/frontend/app/screens/SubmitSession/index.js b/frontend/app/screens/SubmitSession/index.js index 9e47d3d..92fb312 100644 --- a/frontend/app/screens/SubmitSession/index.js +++ b/frontend/app/screens/SubmitSession/index.js @@ -36,7 +36,9 @@ const SubmitSession = ({

    -

    Submit a session

    +

    + Submit a Session, Panel, Lightning Talk, or Training! +

    {submitted &&

    @@ -57,14 +59,21 @@ const SubmitSession = ({ {!submitted &&

    - Now’s your chance! All you need is a big idea and enough - content to fill 45 minutes. + Now’s your chance! All you need is a big idea and content.
    Be brave, be bold. Join the ranks of{' '} those who have gone before.

    +