Merge branch 'release/1.31.0' into master

WikiWatershed · Aug 27, 2020 · c9b4e85 · c9b4e85
2 parents 63691ea + f3e5493
commit c9b4e85
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/src/mmw/js/src/compare/constants.js b/src/mmw/js/src/compare/constants.js
@@ -29,7 +29,7 @@ var CHARTS = 'charts',
             key: 'combined',
             name: 'Combined Hydrology',
             chartDiv: 'combined-hydrology-chart',
-            seriesColors: ['#F8AA00', '#CF4300', '#C2D33C'],
+            seriesColors: ['#F2CF46', '#ED3B3B', '#2D8BFF'],
             legendItems: [
                 {
                     name: 'Evapotranspiration',
@@ -51,7 +51,7 @@ var CHARTS = 'charts',
             key: 'et',
             name: 'Evapotranspiration',
             chartDiv: 'evapotranspiration-chart',
-            seriesColors: ['#C2D33C'],
+            seriesColors: ['#2D8BFF'],
             legendItems: null,
             unit: 'LENGTH_S',
             unitLabel: 'Level',
@@ -60,7 +60,7 @@ var CHARTS = 'charts',
             key: 'runoff',
             name: 'Runoff',
             chartDiv: 'runoff-chart',
-            seriesColors: ['#CF4300'],
+            seriesColors: ['#ED3B3B'],
             legendItems: null,
             unit: 'LENGTH_S',
             unitLabel: 'Level',
@@ -69,7 +69,7 @@ var CHARTS = 'charts',
             key: 'inf',
             name: 'Infiltration',
             chartDiv: 'infiltration-chart',
-            seriesColors: ['#F8AA00'],
+            seriesColors: ['#F2CF46'],
             legendItems: null,
             unit: 'LENGTH_S',
             unitLabel: 'Level',

diff --git a/src/mmw/js/src/core/modificationConfig.json b/src/mmw/js/src/core/modificationConfig.json
@@ -95,7 +95,7 @@
         "strokeColor": "#2364AA"
     },
     "infiltration_basin": {
-        "name": "Vegetation Infiltration Basin",
+        "name": "Vegetated Infiltration Basin",
         "shortName": "Veg Basin",
         "summary": "Constructed large depressions that receive runoff from storm drain sewers or directly from impervious surfaces.  The runoff is temporarily stored until it infiltrates into the ground.",
         "strokeColor": "#B1C4A1"

diff --git a/src/mmw/js/src/modeling/tr55/runoff/views.js b/src/mmw/js/src/modeling/tr55/runoff/views.js
@@ -119,7 +119,7 @@ var ChartView = Marionette.ItemView.extend({
             data = getData(result, seriesNames, seriesDisplayNames,
                            labelDisplayNames);
             chartOptions = {
-                seriesColors: ['#F8AA00', '#CF4300', '#C2D33C'],
+                seriesColors: ['#F2CF46', '#ED3B3B', '#2D8BFF'],
                 yAxisLabel: 'Level (' + lengthUnit + ')',
                 yAxisUnit: lengthUnit,
                 reverseLegend: true,

diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt
@@ -20,7 +20,7 @@ requests[security]==2.22.0
 rollbar==0.13.8
 retry==0.9.1
 python-dateutil==2.6.0
-https://bitbucket.org/jurko/suds/get/94664ddd46a6.tar.gz#egg=suds-jurko
+suds-community==0.8.4
 django_celery_results==1.0.1
 pandas==0.22.0
 tables==3.5.2

diff --git a/src/mmw/sass/pages/_compare.scss b/src/mmw/sass/pages/_compare.scss
@@ -435,15 +435,15 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
     }
 
     #evapotranspiration-badge {
-      background-color: #C2D33C;
+      background-color: #2D8BFF;
     }
 
     #runoff-badge {
-      background-color:#CF4300;
+      background-color:#ED3B3B;
     }
 
     #infiltration-badge {
-      background-color: #F8AA00;
+      background-color: #F2CF46;
     }
 
     .compare-column {

diff --git a/src/mmw/sass/utils/_variables.scss b/src/mmw/sass/utils/_variables.scss
@@ -26,9 +26,9 @@ $brand-primary: #389b9b; /*Teal*/
 $brand-primary-border: #318888; /* Slightly Darker Teal */
 $sky-blue: #bbe5f5; /*Sky*/
 $water: #49b8ea; /*Water*/
-$et: #c2d33c; /*Evapotranspiration*/
-$i: #f8aa00; /*Infiltration*/
-$r: #cf4300; /*Runoff*/
+$et: #2d8bff; /*Evapotranspiration*/
+$i: #f2cf46; /*Infiltration*/
+$r: #ed3b3b; /*Runoff*/
 
 //Heights
 $location-description-height: 68px;

diff --git a/src/mmw/yarn.lock b/src/mmw/yarn.lock
@@ -412,9 +412,9 @@ blueimp-md5@1.1.0:
   integrity sha1-BB7XlIYvPF8oRygqdIEynx0jUs0=
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -1418,9 +1418,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 elliptic@^6.0.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
-  integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"