Merge pull request #33 from loleg/master

Frontend updates v0.4.1

.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.3
+FROM python:3.7.6
 
 RUN apt-get update && apt-get upgrade -y
 

Gruntfile.js

@@ -6,12 +6,20 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json'),
 
     imagemin: {
-      media: {
+      // media: {
+      //   files: [{
+      //     expand: true,
+      //     cwd: 'media/images/',
+      //     src: '{,*/}*.{png,jpg,jpeg,gif}',
+      //     dest: 'media/images'
+      //   }]
+      // },
+      static: {
         files: [{
           expand: true,
-          cwd: 'media/images/',
+          cwd: 'publichealth/static/images',
           src: '{,*/}*.{png,jpg,jpeg,gif}',
-          dest: 'media/images'
+          dest: 'publichealth/static/images'
         }]
       }
     },

Pipfile.lock

@@ -142,10 +142,10 @@
         },
         "django-modelcluster": {
             "hashes": [
-                "sha256:09e4242119f04e81bfab25c77b09cb6e9d469dc14b14e71f04cd358c7256bc2a",
+                "sha256:942ec7ea970c9ef9ded76a1c79cfe69432a7f1c106b505c501d40f100bcbc91a",
-                "sha256:6f857bb0251c0982afeb35474aeedb3ec72260df81a0262188df8108067467ba"
+                "sha256:c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa"
             ],
-            "version": "==5.0.1"
+            "version": "==5.0.2"
         },
         "django-redis": {
             "hashes": [
@@ -165,10 +165,10 @@
         },
         "django-taggit": {
             "hashes": [
-                "sha256:4186a6ce1e1e9af5e2db8dd3479c5d31fa11a87d216a2ce5089ba3afde24a2c5",
+                "sha256:4a833bf71f4c2deddd9745924eee53be1c075d7f0020a06f12e29fa3d752732d",
-                "sha256:bd1ec80b813d60adadaa94dcce4bfd971cb4ae717b07e69fedbd38d417deb6e9"
+                "sha256:609b0223d8a652f3fae088b7fd29f294fdadaca2d7931d45c27d6c59b02fdf31"
             ],
-            "version": "==1.2.0"
+            "version": "==1.3.0"
         },
         "django-toolbelt": {
             "hashes": [
@@ -448,10 +448,10 @@
         },
         "six": {
             "hashes": [
-                "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a",
+                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"
+                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "version": "==1.14.0"
+            "version": "==1.15.0"
         },
         "soupsieve": {
             "hashes": [
@@ -495,9 +495,9 @@
         },
         "sqlalchemy-utils": {
             "hashes": [
-                "sha256:680068c4b671225c183815e19b6f4adc765a9989dd5d9e8e9c900ede30cc7434"
+                "sha256:7a7fab14bed80df065412bbf71a0a9b0bfeb4b7c111c2d9bffe57283082f3a6b"
             ],
-            "version": "==0.36.5"
+            "version": "==0.36.6"
         },
         "sqlparse": {
             "hashes": [
@@ -550,11 +550,11 @@
         },
         "whitenoise": {
             "hashes": [
-                "sha256:0f9137f74bd95fa54329ace88d8dc695fbe895369a632e35f7a136e003e41d73",
+                "sha256:60154b976a13901414a25b0273a841145f77eb34a141f9ae032a0ace3e4d5b27",
-                "sha256:62556265ec1011bd87113fb81b7516f52688887b7a010ee899ff1fd18fd22700"
+                "sha256:6dd26bfda3af29177d8ab7333a0c7b7642eb615ce83764f4d15a9aecda3201c4"
             ],
             "index": "pypi",
-            "version": "==5.0.1"
+            "version": "==5.1.0"
         },
         "willow": {
             "hashes": [
@@ -639,10 +639,10 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3",
+                "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8",
-                "sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752"
+                "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"
             ],
-            "version": "==20.3"
+            "version": "==20.4"
         },
         "pluggy": {
             "hashes": [
@@ -696,10 +696,10 @@
         },
         "six": {
             "hashes": [
-                "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a",
+                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"
+                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "version": "==1.14.0"
+            "version": "==1.15.0"
         },
         "splinter": {
             "hashes": [
@@ -724,11 +724,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:8d97bfaf70053ed3db56f57377288621f1bcc7621446d301927d18df93b1c4c3",
+                "sha256:322dfdf007d7d53323f767badcb068a5cfa7c44d8aabb698d131b28cf44e62c4",
-                "sha256:af09c19478e8fc7ce7555b3d802ddf601b82684b874812c5857f774b8aee1b67"
+                "sha256:8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83"
             ],
             "index": "pypi",
-            "version": "==3.15.0"
+            "version": "==3.15.1"
         },
         "urllib3": {
             "hashes": [
@@ -739,10 +739,10 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:b4c14d4d73a0c23db267095383c4276ef60e161f94fde0427f2f21a0132dde74",
+                "sha256:a116629d4e7f4d03433b8afa27f43deba09d48bc48f5ecefa4f015a178efb6cf",
-                "sha256:fd0e54dec8ac96c1c7c87daba85f0a59a7c37fe38748e154306ca21c73244637"
+                "sha256:a730548b27366c5e6cbdf6f97406d861cccece2e22275e8e1a757aeff5e00c70"
             ],
-            "version": "==20.0.20"
+            "version": "==20.0.21"
         },
         "wcwidth": {
             "hashes": [

publichealth/static/css/main.scss

@@ -126,4 +126,7 @@ $slider-nav: 200px;
   ul { list-style: none; margin: 0; padding: 1em 0 0; }
 }
 
+// Fix Bootstrap 3 warning
+.media, .media-body { zoom: none !important; transform: scale(1); }
+
 @import "subsites";

publichealth/static/css/paper/_bootswatch.scss

@@ -1,8 +1,8 @@
-// Paper 3.3.7
+// Paper 3.4.1
 // Bootswatch
 // -----------------------------------------------------
 
-$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default;
+$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" !default;
 @import url($web-font-path);
 
 // Navbar =====================================================================

publichealth/static/css/paper/_variables.scss

@@ -1,4 +1,5 @@
-// Paper 3.3.7
+$bootstrap-sass-asset-helper: false !default;
+// Paper 3.4.1
 // Variables
 // --------------------------------------------------
 
@@ -487,7 +488,7 @@ $pager-disabled-color:                 $pagination-disabled-color !default;
 
 $jumbotron-padding:              30px !default;
 $jumbotron-color:                inherit !default;
-$jumbotron-bg:                   $gray-lighter !default;
+$jumbotron-bg:                   #f9f9f9 !default;
 $jumbotron-heading-color:        $headings-color !default;
 $jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
 $jumbotron-heading-font-size:    ceil(($font-size-base * 4.5)) !default;

requirements.txt

@@ -1,4 +1,4 @@
-# Updated: 15.5.2020
+# Updated: 27.5.2020
 
 # Core
 wagtail==2.9
@@ -16,9 +16,9 @@ guess-language-spirit==0.5.3
 django-redis==4.11.0
 
 # Frontend
-django-anymail==7.0.0
+django-anymail==7.1.0
 django-colorful==1.3
-django-crispy-forms==1.9.0
+django-crispy-forms==1.9.1
 django-el-pagination==3.3.0
 django-libsass==0.8
 django-social-share==1.4.0