Merge pull request #100 from todrobbins/master

0.1.1 updated site design, added `/contribute`

app.js

@@ -32,7 +32,7 @@ app.get('/', function(req, res) {
 })
 
 app.get('/about', function(req, res) {
-  res.render('about.html', {});
+  res.render('about.html');
 });
 
 app.get('/search', function(req, res) {
@@ -48,6 +48,10 @@ app.get('/add', function(req, res) {
   res.render('add.html');
 });
 
+app.get('/contribute', function(req, res) {
+  res.render('contribute.html');
+});
+
 app.get('/catalog/:id', function(req, res) {
   res.redirect(301, '/portal/' + req.params.id);
 });
@@ -116,4 +120,3 @@ model.catalog.loadUrl(config.databaseUrl, function(err) {
     console.log("Listening on " + app.get('port'));
   });
 });
-

issue_template.md

@@ -9,8 +9,8 @@ Otherwise, follow the directions below.
 
 `* Required`
 
-# Key Information
-
+# Key Data Portal Information
+---
 ## Title *
 <!-- Full title of the portal, e.g. "Data.Gov.UK - Official UK Government Portal" -->
 

package.json

@@ -1,13 +1,13 @@
 {
-    "name": "dataportals"
-  , "version": "0.1.0"
-  , "dependencies": {
-      "express": "3.x",
-      "nunjucks": "1.1.0",
-      "underscore": "",
-      "request": "",
-      "marked": "",
-      "csv-parse": ""
+  "name": "dataportals",
+  "version": "0.1.1",
+  "dependencies": {
+    "express": "3.x",
+    "nunjucks": "1.1.0",
+    "underscore": "",
+    "request": "",
+    "marked": "",
+    "csv-parse": ""
   },
   "engines": {
     "node": "0.10.x"

public/css/style.css

@@ -1,57 +1,73 @@
 html, body {
-  background-color: #eee;
+  font-family: 'PT Sans', Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  background-color: ;
+  background: url(../img/cloth.png) #eee;
 }
 body {
-  padding-top: 40px;
-  font-family: 'PT Sans', Helvetica, Arial, sans-serif;
+  padding-top: 36px;
+}
+
+h3, h4, h5, h6 {
+  margin-bottom: 1rem;
+}
+
+h4 {
+  margin-top: 2rem;
+  border-bottom: 1px solid #eee;
+}
+
+h5 {
+  margin-top: 2rem;
+  font-size: 1rem;
+  font-weight: bold;
+}
+
+.navbar-default .navbar-brand {
+  font-weight: 600;
+  font-size: 1.2rem;
+  letter-spacing: 1px;
+  color: #337ab7;
+}
+
+.navbar-default .navbar-brand:focus, .navbar-default .navbar-brand:hover {
+  color: #23527c;
 }
 
 .content {
   background-color: #fff;
   padding: 20px;
   margin: 0 -20px;
-  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-          box-shadow: 0 1px 2px rgba(0,0,0,.15);
 }
 
 .page-header {
-  background-color: #f5f5f5;
+  background: linear-gradient(0deg, #eee 70%, #ccc);
   padding: 20px 20px 10px;
   margin: -20px -20px 20px;
 }
 
-.navbar .nav > li > a {
-  padding-top: 12px;
-  font-weight: bold;
+ul {
+  -webkit-padding-start: 0;
 }
 
-.navbar .brand {
-  padding: 12px 20px 5px;
+ul#curators li {
+  margin-left: 2rem;
 }
 
-.navbar .brand img {
-  height: 30px;
-  margin-top: -3px;
+dd {
+  margin-bottom: .6rem;
 }
 
-.navbar .navbar-search {
-  margin-top: 8px;
-}
-
-.navbar li.logo a {
-  padding: 5px 10px 0px;
-}
-
-.navbar li.logo img {
-  height: 30px;
+.break-url {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
 }
 
 footer {
-  background-color: #f5f5f5;
   padding: 20px 20px 20px;
   margin: 15px -20px -20px;
   border-top: solid 1px #eee;
+  text-align: center;
 }
 
 footer ul {
@@ -67,13 +83,19 @@ footer ul li.logo img {
   max-height: 100px;
 }
 
+section {
+  margin-bottom: 2rem;
+}
 
-/********************************************************************
-  * Form
-  *******************************************************************/
+section ol, section ul {
+  background: #d4ecfa;
+  line-height: 1.5rem;
+  padding: 1rem 0;
+  border-radius: .4rem;
+}
 
-.home-map .heading {
-  margin-top: -6px;
+section ol li, section ul li {
+  margin-left: 2rem;
 }
 
 /********************************************************************
@@ -85,7 +107,7 @@ footer ul li.logo img {
 }
 
 .recline-query-editor .text-query input {
-  width: 400px;
+  max-width: 100%;
 }
 
 .recline-query-editor button {
@@ -100,8 +122,8 @@ footer ul li.logo img {
   padding-bottom: 20px;
   margin-bottom: 20px;
   border-bottom: dotted 1px #ccc;
-  font-size: 16px;
-  line-height: 20px;
+  font-size: 1rem;
+  line-height: 1.5;
 }
 
 .catalog.summary .logo {
@@ -112,7 +134,7 @@ footer ul li.logo img {
 .catalog.summary h3 {
   margin: 0;
   padding: 0;
-  font-size: 20px;
+  font-size: 1.2rem;
   line-height: 1.5;
 }
 
@@ -139,14 +161,14 @@ footer ul li.logo img {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  font-size: 10.998px;
+  font-size: .8rem;
   font-weight: bold;
-  line-height: 14px;
+  line-height: .8rem;
   color: white;
   vertical-align: baseline;
   white-space: nowrap;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background: #55A1CE;
+  background: #55a1ce;
   margin-right: 3px;
 }
 
@@ -161,9 +183,9 @@ footer ul li.logo img {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  font-size: 10.998px;
+  font-size: .8rem;
   font-weight: bold;
-  line-height: 14px;
+  line-height: .8rem;
   color: white;
   vertical-align: baseline;
   white-space: nowrap;
@@ -205,3 +227,22 @@ footer ul li.logo img {
 a.inverted {
   color: #fff;
 }
+
+
+/********************************************************************
+  * Media Queries
+  *******************************************************************/
+
+  @media screen and (max-width: 768px) {
+    .h1, h1 { font-size: 30px; }
+    .h2, h2 { font-size: 26px; }
+    .h3, h3 { font-size: 22px; }
+    .h4, h4 { font-size: 18px; }
+  }
+
+  @media screen and (max-width: 480px) {
+    .h1, h1 { font-size: 24px; }
+    .h2, h2 { font-size: 20px; }
+    .h3, h3 { font-size: 18px; }
+    .h4, h4 { font-size: 18px; }
+  }