Merge branch 'stable'

app/app/settings.py

@@ -294,7 +294,7 @@
         'handlers': {
             'console': {
                 'level': 'DEBUG',
-                'class': 'logging.StreamHandler',
+                'class': 'loggging.StreamHandler',
                 'formatter': 'verbose',
             },
             'watchtower': {
@@ -336,19 +336,7 @@
     LOGGING = {}
 
 if SENTRY_DSN:
-    if LOGGING:
-        LOGGING['handlers']['sentry'] = {
-            'level': 'ERROR',  # To capture more than ERROR, change to WARNING, INFO, etc.
-            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-        }
-        LOGGING['loggers']['root']['handlers'].append('sentry');
-        for logger in ['raven', 'sentry.errors']:
-            LOGGING['loggers'][logger] = {
-                'level': 'DEBUG',
-                'handlers': ['console'],
-                'propagate': False,
-            }
-    else:
+    if ENV == 'prod':
         LOGGING = {
             'version': 1,
             'disable_existing_loggers': True,

app/assets/v2/css/base.css

@@ -1426,7 +1426,12 @@ input.is-invalid {
   width: 100%;
 }
 
-.results .bounty_status .yellow_box, .green_box, .blue_box, .pink_box, .lblue_box {
+.results .bounty_status .box_1,
+.box_2,
+.box_3,
+.box_4,
+.box_5,
+.box_6 {
   float: left;
   width: 1rem;
   height: 1rem;
@@ -1450,29 +1455,34 @@ input.is-invalid {
   background-color: #eee;
 }
 
-.yellow_box {
-  color: #FFCE08;
-  border: 10px solid #FFCE08;
+.box_1 {
+  color: #011f4b;
+  border: 10px solid #011f4b;
 }
 
-.green_box {
-  color: #F2F6F9;
-  border: 10px solid #25E899;
+.box_2 {
+  color: #03396c;
+  border: 10px solid #03396c;
 }
 
-.blue_box {
-  color: #3E00FF;
-  border: 10px solid #3E00FF;
+.box_3 {
+  color: #005b96;
+  border: 10px solid #005b96;
+}
+
+.box_4 {
+  color: #6497b1;
+  border: 10px solid #6497b1;
 }
 
-.lblue_box {
-  color: #fbd0e6;
-  border: 10px solid #fbd0e6;
+.box_5 {
+  color: #b3cde0;
+  border: 10px solid #b3cde0;
 }
 
-.pink_box {
-  color: #F9006C;
-  border: 10px solid #F9006C;
+.box_6 {
+  color: #d3ddf0;
+  border: 10px solid #d3ddf0;
 }
 
 .results .icon {