Merge branch 'master' into stage

Author: yvess

Makefile

@@ -1,5 +1,5 @@
 SHELL = /bin/bash
-DOCKER_EXEC_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec -T django")
+DOCKER_EXEC_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
 DOCKER_EXEC_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec vue")
 DOCKER_EXEC_WWW=$(shell command -v docker > /dev/null && echo "docker-compose exec www")
 

django/main/settings.py

@@ -4,6 +4,7 @@
 DEBUG = os.getenv('DJANGO_DEBUG') == 'True'
 USE_HTTPS = os.getenv('DJANGO_HTTPS') == 'True'
 
+
 if USE_HTTPS:
     SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
     SESSION_COOKIE_SECURE = True
@@ -143,4 +144,5 @@
     }
 }
 THUMBNAIL_BACKEND = 'main.utils.PermalinkThumbnailBackend'
+THUMBNAIL_PREFIX = 'cache/'
 SAVE_SCREENSHOT_ENABLED = True

django/main/templates/admin/base_site.html

@@ -53,5 +53,9 @@
         background: #543076;
     }
 
+    .button:active, input[type=submit]:active, input[type=button]:active, .button:focus, input[type=submit]:focus, input[type=button]:focus, .button:hover, input[type=submit]:hover, input[type=button]:hover {
+        background: #61388B !important;
+    }
+
 </style>
 {% endblock %}