Merge branch 'master' of github.com:loleg/public-health-ch

.gitignore

@@ -16,4 +16,3 @@
 /docs/_build/
 /node_modules/
 /publichealth/static/libs/
-/mockup/assets/css/*.css

README.md

@@ -31,7 +31,7 @@ bower install
 
 The first command (`..install -g..`) may require `sudo` if you installed node.js as a system package.
 
-If you are only working on the frontend, you can start a local webserver and work on frontend assets without the backend setup described below. Mock content is at `mockup`, and there is a `grunt browser-sync` setup for working with frontend assets.
+If you are only working on the frontend, you can start a local webserver and work on frontend assets without the backend setup described below. There is a `grunt browser-sync` setup for working with frontend assets.
 
 **Backend setup**
 

publichealth/static/css/subsites.scss

@@ -46,8 +46,8 @@
     padding-top: 50px;
   }
   .navbar-brand {
-    width: 400px;
-    height: 100px;
+    width: 240px;
+    height: 64px;
     background-size: contain !important;
     background-repeat: no-repeat;
 

requirements.txt

@@ -6,8 +6,8 @@ Django>=1.11.7,<2.0.0
 elasticsearch>=2.0.0,<3.0.0
 
 # Database
-psycopg2==2.7.4
-psycopg2-binary==2.7.4
+psycopg2==2.7.5
+psycopg2-binary==2.7.5
 dj-database-url==0.5.0
 
 # Content
@@ -20,13 +20,13 @@ django-redis==4.9.0
 # Frontend
 django-libsass==0.7
 libsass==0.14.5
-Pillow==5.1.0
+Pillow==5.2.0
 
 # Development tools
 stellar==0.4.5
 
 # Production dependencies
-gunicorn==19.8.1
+gunicorn==19.9.0
 whitenoise==3.3.1
 ConcurrentLogHandler==0.9.1
-django-anymail==2.2
+django-anymail==3.0