diff --git a/.gitignore b/.gitignore index 5a3b9d3d..e76920ba 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ node_modules *config.json *.log ecosystem.config.js +app/start.sh # Data etl/cache/* diff --git a/app/public/images/logo-casa.png b/app/public/images/logo-casa.png old mode 100755 new mode 100644 index ed7e1fc0..de574edb Binary files a/app/public/images/logo-casa.png and b/app/public/images/logo-casa.png differ diff --git a/app/public/images/logo-gla.png b/app/public/images/logo-gla.png old mode 100755 new mode 100644 index 4d7c927a..7673c74f Binary files a/app/public/images/logo-gla.png and b/app/public/images/logo-gla.png differ diff --git a/app/public/images/logo-he.png b/app/public/images/logo-he.png old mode 100755 new mode 100644 index 74d0ece5..91122977 Binary files a/app/public/images/logo-he.png and b/app/public/images/logo-he.png differ diff --git a/app/public/images/logo-os.png b/app/public/images/logo-os.png old mode 100755 new mode 100644 index efe5df81..8d0c98d3 Binary files a/app/public/images/logo-os.png and b/app/public/images/logo-os.png differ diff --git a/app/public/images/logo-ucl.png b/app/public/images/logo-ucl.png old mode 100755 new mode 100644 index 0934f254..3e92b838 Binary files a/app/public/images/logo-ucl.png and b/app/public/images/logo-ucl.png differ diff --git a/app/src/frontend/about.css b/app/src/frontend/about.css index 3e980d9b..0ee2d1c4 100644 --- a/app/src/frontend/about.css +++ b/app/src/frontend/about.css @@ -53,24 +53,6 @@ display: block; } -/** - * Logos - */ -.logo-list { - text-align: center; - padding: 0; - list-style: none; -} -.logo-list li { - display: inline-block; - width: 8em; - padding: 0 0.25em; - vertical-align: middle; -} -.logo-list li:first-child { - width: 4em; -} - /** * Data categories */ diff --git a/app/src/frontend/about.js b/app/src/frontend/about.js index 0b6b10a9..8d69d975 100644 --- a/app/src/frontend/about.js +++ b/app/src/frontend/about.js @@ -1,10 +1,11 @@ import React from 'react'; +import SupporterLogos from './supporter-logos'; import './about.css'; const AboutPage = () => (
-
+

Can you help us capture information on every building in London?

@@ -45,9 +46,9 @@ const AboutPage = () => ( href="files/colouring-london-online-exhibition.pdf"> View online exhibition
- +
-
+

Colouring London is being designed and built by the Centre for Advanced Spatial @@ -57,39 +58,8 @@ const AboutPage = () => ( will launch in 2019.

- -
+ +

Data Categories

@@ -156,7 +126,7 @@ const AboutPage = () => (

Once built, our platform will allow you to:

-
+

View maps

@@ -169,7 +139,7 @@ const AboutPage = () => ( alt="Preview of view maps page" />

-
+

Add and edit data

@@ -181,7 +151,7 @@ const AboutPage = () => ( alt="Preview of add/edit data page" />

-
+

See how people are using our data

@@ -196,7 +166,7 @@ const AboutPage = () => (

-
+

Download, remix and reuse

diff --git a/app/src/frontend/app.js b/app/src/frontend/app.js index d03ae0a0..4b9592b2 100644 --- a/app/src/frontend/app.js +++ b/app/src/frontend/app.js @@ -2,6 +2,9 @@ import React, { Fragment } from 'react'; import { Route, Switch, Link } from 'react-router-dom'; import { TransitionGroup, CSSTransition } from 'react-transition-group' +import '../../node_modules/bootstrap/dist/css/bootstrap.min.css'; +import './main.css'; + import AboutPage from './about'; import BetaBanner from './beta-banner'; import BuildingEdit from './building-edit'; @@ -14,8 +17,6 @@ import MyAccountPage from './my-account'; import SignUp from './signup'; import Welcome from './welcome'; -import '../../node_modules/bootstrap/dist/css/bootstrap.min.css'; -import './main.css' class App extends React.Component { diff --git a/app/src/frontend/login.js b/app/src/frontend/login.js index 0dcecbbd..4df84858 100644 --- a/app/src/frontend/login.js +++ b/app/src/frontend/login.js @@ -3,6 +3,7 @@ import { Redirect, Link } from 'react-router-dom'; import ErrorBox from './error-box'; import InfoBox from './info-box'; +import SupporterLogos from './supporter-logos'; class Login extends Component { constructor(props) { @@ -105,6 +106,10 @@ class Login extends Component {

+
+
+ +
) } diff --git a/app/src/frontend/signup.js b/app/src/frontend/signup.js index 9773faab..d6f2a8d3 100644 --- a/app/src/frontend/signup.js +++ b/app/src/frontend/signup.js @@ -3,6 +3,7 @@ import { Redirect, Link } from 'react-router-dom'; import ErrorBox from './error-box'; import InfoBox from './info-box'; +import SupporterLogos from './supporter-logos'; class SignUp extends Component { constructor(props) { @@ -139,6 +140,10 @@ class SignUp extends Component { +
+
+ +
) } diff --git a/app/src/frontend/styles/content.css b/app/src/frontend/styles/content.css index 3710a988..32fbdc5b 100644 --- a/app/src/frontend/styles/content.css +++ b/app/src/frontend/styles/content.css @@ -55,11 +55,11 @@ p a.btn:active { h1, h2, h3, h4 { font-weight: normal; } -.h1 { +main .h1 { font-size: 2em; - margin-bottom: 0.5em; + margin: 0.5em 0; } -.h2 { +main .h2 { font-size: 1.5em; margin: 0.25em 0 0.5em; } diff --git a/app/src/frontend/styles/layout.css b/app/src/frontend/styles/layout.css index c472dd45..50a37200 100644 --- a/app/src/frontend/styles/layout.css +++ b/app/src/frontend/styles/layout.css @@ -23,11 +23,16 @@ article section { overflow: hidden; margin: 2.25em 0 4em; +} +article .color-block { padding: 2em 0 4em; + margin-top: 0; + margin-bottom: 0; } .main-col { - max-width: 40em; - margin: 0 auto; + max-width: 48em; + margin-left: auto; + margin-right: auto; padding-left: 1em; padding-right: 1em; } diff --git a/app/src/frontend/supporter-logos.css b/app/src/frontend/supporter-logos.css new file mode 100644 index 00000000..f78cd1b9 --- /dev/null +++ b/app/src/frontend/supporter-logos.css @@ -0,0 +1,27 @@ +/** + * Logos + */ +.logo-list { + text-align: center; + padding: 0; + list-style: none; +} +.logo-list li { + display: inline-block; + padding: 0 0.25em; + vertical-align: middle; +} +.logo-list a { + opacity: 1; + transition: opacity 0.2s; +} +.logo-list a:hover, +.logo-list a:focus, +.logo-list a:active { + opacity: 0.6; + outline: none; +} +.logo-list img { + width: auto; + height: 5.25rem; +} diff --git a/app/src/frontend/supporter-logos.js b/app/src/frontend/supporter-logos.js new file mode 100644 index 00000000..ec235fe1 --- /dev/null +++ b/app/src/frontend/supporter-logos.js @@ -0,0 +1,43 @@ +import React, { Fragment } from 'react'; + +import './supporter-logos.css'; + +const SupporterLogos = () => ( + +

Lead Organisation and Project Partners

+ +
+); + +export default SupporterLogos;