From 94d158c59e56a459361ff3d4464dc86e6e34d4e9 Mon Sep 17 00:00:00 2001
From: Tom Russell <tomalrussell@gmail.com>
Date: Wed, 14 Aug 2019 12:22:44 +0100
Subject: [PATCH] Pull out categories.css

---
 app/src/frontend/building/categories.css |  27 +++
 app/src/frontend/building/categories.tsx | 246 ++++++++++++-----------
 app/src/frontend/pages/about.css         |  28 ---
 app/src/frontend/pages/about.tsx         |  52 +----
 app/src/frontend/styles/forms.css        |  14 --
 5 files changed, 157 insertions(+), 210 deletions(-)
 create mode 100644 app/src/frontend/building/categories.css

diff --git a/app/src/frontend/building/categories.css b/app/src/frontend/building/categories.css
new file mode 100644
index 00000000..17ce1a25
--- /dev/null
+++ b/app/src/frontend/building/categories.css
@@ -0,0 +1,27 @@
+/**
+ * Data categories
+ */
+ .data-category-list {
+  padding: 0;
+  text-align: center;
+  list-style: none;
+  margin: 0 -0.75em;
+}
+.data-category-list li {
+  display: inline-block;
+  vertical-align: bottom;
+  width: 9em;
+  height: 9em;
+  margin: 0.375em;
+  padding: 0.1em;
+}
+.data-category-list .category {
+  text-align: center;
+  font-size: 1.5em;
+  margin: 1.4em 0 0.5em;
+}
+.data-category-list .description {
+  text-align: center;
+  font-size: 1em;
+  margin: 0;
+}
diff --git a/app/src/frontend/building/categories.tsx b/app/src/frontend/building/categories.tsx
index 70e567f4..645a9262 100644
--- a/app/src/frontend/building/categories.tsx
+++ b/app/src/frontend/building/categories.tsx
@@ -4,104 +4,120 @@ import PropTypes from 'prop-types';
 
 import Sidebar from './sidebar';
 
+import './categories.css'
+
 const Categories = (props) => (
     <Sidebar>
-        <Category
-            title="Location"
-            slug="location"
-            help="https://pages.colouring.london/location"
-            inactive={false}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Land Use"
-            slug="use"
-            help="https://pages.colouring.london/use"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Type"
-            slug="type"
-            help="https://pages.colouring.london/buildingtypology"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Age"
-            slug="age"
-            help="https://pages.colouring.london/age"
-            inactive={false}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Size &amp; Shape"
-            slug="size"
-            help="https://pages.colouring.london/shapeandsize"
-            inactive={false}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Construction"
-            slug="construction"
-            help="https://pages.colouring.london/construction"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Team"
-            slug="team"
-            help="https://pages.colouring.london/team"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Sustainability"
-            slug="sustainability"
-            help="https://pages.colouring.london/sustainability"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Greenery"
-            slug="greenery"
-            help="https://pages.colouring.london/greenery"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Community"
-            slug="community"
-            help="https://pages.colouring.london/community"
-            inactive={false}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Planning"
-            slug="planning"
-            help="https://pages.colouring.london/planning"
-            inactive={true}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
-        <Category
-            title="Like Me!"
-            slug="like"
-            help="https://pages.colouring.london/likeme"
-            inactive={false}
-            mode={props.mode}
-            building_id={props.building_id}
-        />
+        <nav><ol className="data-category-list">
+            <Category
+                title="Location"
+                desc="Where's the building?"
+                slug="location"
+                help="https://pages.colouring.london/location"
+                inactive={false}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Land Use"
+                desc="What's it used for?"
+                slug="use"
+                help="https://pages.colouring.london/use"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Type"
+                desc="Building type"
+                slug="type"
+                help="https://pages.colouring.london/buildingtypology"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Age"
+                desc="Age and history"
+                slug="age"
+                help="https://pages.colouring.london/age"
+                inactive={false}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Size &amp; Shape"
+                desc="Form and scale"
+                slug="size"
+                help="https://pages.colouring.london/shapeandsize"
+                inactive={false}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Construction"
+                desc="Methods and materials"
+                slug="construction"
+                help="https://pages.colouring.london/construction"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Team"
+                desc="Builder and designer"
+                slug="team"
+                help="https://pages.colouring.london/team"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Sustainability"
+                desc="Performance"
+                slug="sustainability"
+                help="https://pages.colouring.london/sustainability"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Greenery"
+                desc="Green context"
+                slug="greenery"
+                help="https://pages.colouring.london/greenery"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Community"
+                desc="Public asset?"
+                slug="community"
+                help="https://pages.colouring.london/community"
+                inactive={false}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Planning"
+                desc="Special controls?"
+                slug="planning"
+                help="https://pages.colouring.london/planning"
+                inactive={true}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+            <Category
+                title="Like Me?"
+                desc="Adds to the city?"
+                slug="like"
+                help="https://pages.colouring.london/likeme"
+                inactive={false}
+                mode={props.mode}
+                building_id={props.building_id}
+            />
+        </ol></nav>
     </Sidebar>
 )
 
@@ -111,32 +127,26 @@ Categories.propTypes = {
 }
 
 const Category = (props) => (
-    <section className={(props.inactive? 'inactive ': '') + 'data-section legend'}>
-        <header className={`section-header ${props.mode} ${props.slug}`}>
-            <NavLink
-                to={`/${props.mode}/${props.slug}/building/${props.building_id}.html`}
-                title={
-                    (props.inactive)?
-                        'Coming soon… Click the ? for more info.'
-                        : 'Show on map'
-                }>
-                <h3 className="h3">{props.title}</h3>
-            </NavLink>
-            <nav className="icon-buttons">
-                {
-                    props.help?
-                        <a className="icon-button help" href={props.help}>
-                        Info
-                        </a>
-                        : null
-                }
-            </nav>
-        </header>
-    </section>
+    <li className={`category-block ${props.slug}`}>
+        <NavLink
+            to={`/${props.mode}/${props.slug}/building/${props.building_id}.html`}
+            title={
+                (props.inactive)?
+                    'Coming soon… Click the ? for more info.'
+                    : 'Show on map'
+            }>
+            <h3 className="category">{props.title}</h3>
+            <p className="description">{props.desc}</p>
+        </NavLink>
+        <a className="icon-button help" href={props.help}>
+            More info
+        </a>
+    </li>
 )
 
 Category.propTypes = {
     title: PropTypes.string,
+    desc: PropTypes.string,
     slug: PropTypes.string,
     help: PropTypes.string,
     inactive: PropTypes.bool,
diff --git a/app/src/frontend/pages/about.css b/app/src/frontend/pages/about.css
index d2e99145..9adfec0a 100644
--- a/app/src/frontend/pages/about.css
+++ b/app/src/frontend/pages/about.css
@@ -52,31 +52,3 @@
 .carousel.active .carousel-content li.current {
     display: block;
 }
-
-/**
- * Data categories
- */
-.data-category-list {
-    padding: 0;
-    text-align: center;
-    list-style: none;
-    margin: 0 -0.75em;
-}
-.data-category-list li {
-    display: inline-block;
-    vertical-align: bottom;
-    width: 9em;
-    height: 9em;
-    margin: 0.375em;
-    padding: 0.1em;
-}
-.data-category-list .category {
-    text-align: center;
-    font-size: 1.5em;
-    margin: 1.4em 0 0.5em;
-}
-.data-category-list .description {
-    text-align: center;
-    font-size: 1em;
-    margin: 0;
-}
diff --git a/app/src/frontend/pages/about.tsx b/app/src/frontend/pages/about.tsx
index 5a4baa9b..1d3f98ea 100644
--- a/app/src/frontend/pages/about.tsx
+++ b/app/src/frontend/pages/about.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import SupporterLogos from '../components/supporter-logos';
 import './about.css';
+import Categories from '../building/categories';
 
 const AboutPage = () => (
     <article>
@@ -71,56 +72,7 @@ const AboutPage = () => (
         research.
 
             </p>
-            <ol className="data-category-list">
-                <li className="bold-yellow">
-                    <h3 className="category">Location</h3>
-                    <p className="description">Where is it?</p>
-                </li>
-                <li className="bright-yellow">
-                    <h3 className="category">Use</h3>
-                    <p className="description">How is it used?</p>
-                </li>
-                <li className="bold-orange">
-                    <h3 className="category">Type</h3>
-                    <p className="description">How was it first used?</p>
-                </li>
-                <li className="red">
-                    <h3 className="category">Age</h3>
-                    <p className="description">When was it built?</p>
-                </li>
-                <li className="pastel-pink">
-                    <h3 className="category">Size</h3>
-                    <p className="description">How big is it?</p>
-                </li>
-                <li className="pastel-purple">
-                    <h3 className="category">Construction</h3>
-                    <p className="description">How is it built?</p>
-                </li>
-                <li className="blue-grey">
-                    <h3 className="category">Design/Build</h3>
-                    <p className="description">Who built it?</p>
-                </li>
-                <li className="bright-green">
-                    <h3 className="category">Street Front</h3>
-                    <p className="description">How does it relate to the street?</p>
-                </li>
-                <li className="pastel-green">
-                    <h3 className="category">Greenery</h3>
-                    <p className="description">Is it near a tree or park?</p>
-                </li>
-                <li className="bright-blue">
-                    <h3 className="category">Protection</h3>
-                    <p className="description">Is it designated?</p>
-                </li>
-                <li className="pale-grey">
-                    <h3 className="category">Demolitions</h3>
-                    <p className="description">How many rebuilds on the site?</p>
-                </li>
-                <li className="pale-brown">
-                    <h3 className="category">Like Me?</h3>
-                    <p className="description">Do you like it?</p>
-                </li>
-            </ol>
+            <Categories building_id={2503371} mode="view" />
         </div>
         <hr/>
         <div className="main-col">
diff --git a/app/src/frontend/styles/forms.css b/app/src/frontend/styles/forms.css
index 96c28fb6..4a8d61a8 100644
--- a/app/src/frontend/styles/forms.css
+++ b/app/src/frontend/styles/forms.css
@@ -41,17 +41,3 @@ form .btn {
     margin-right: 0;
     text-align: center;
 }
-.btn.btn-half {
-    width: 100%;
-    margin-bottom: 0.25rem;
-}
-@media (min-width: 768px) {
-    .btn.btn-half {
-        width: 49%;
-        margin-left: 0;
-        margin-right: 2%;
-    }
-    .btn.btn-half:nth-child(2n) {
-        margin-right: 0;
-    }
-}