From ee9fc034b62d31b263eea00f5c6a09d23ec9349d Mon Sep 17 00:00:00 2001 From: itsyeonjoon Date: Sun, 21 Feb 2021 09:19:48 -0800 Subject: [PATCH 1/3] changed region outline colors --- .../jsr305/ivydata-[1.3, 1.4).properties | 4 ++-- .../guice-multibindings/ivydata-4.0-beta5.properties | 2 +- .vscode/settings.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.ivy2/cache/com.google.code.findbugs/jsr305/ivydata-[1.3, 1.4).properties b/.ivy2/cache/com.google.code.findbugs/jsr305/ivydata-[1.3, 1.4).properties index c1b8aec93a..dfad0f249a 100644 --- a/.ivy2/cache/com.google.code.findbugs/jsr305/ivydata-[1.3, 1.4).properties +++ b/.ivy2/cache/com.google.code.findbugs/jsr305/ivydata-[1.3, 1.4).properties @@ -1,4 +1,4 @@ #ivy cached data file for com.google.code.findbugs#jsr305;[1.3, 1.4) -#Tue Jan 12 20:40:47 UTC 2021 -resolved.time=1610484047427 +#Sun Feb 21 17:00:01 UTC 2021 +resolved.time=1613926801226 resolved.revision=1.3.9 diff --git a/.ivy2/cache/com.google.inject.extensions/guice-multibindings/ivydata-4.0-beta5.properties b/.ivy2/cache/com.google.inject.extensions/guice-multibindings/ivydata-4.0-beta5.properties index bff63d3459..1b4cb17db0 100644 --- a/.ivy2/cache/com.google.inject.extensions/guice-multibindings/ivydata-4.0-beta5.properties +++ b/.ivy2/cache/com.google.inject.extensions/guice-multibindings/ivydata-4.0-beta5.properties @@ -1,5 +1,5 @@ #ivy cached data file for com.google.inject.extensions#guice-multibindings;4.0-beta5 -#Tue Jan 12 20:40:47 UTC 2021 +#Sun Feb 21 17:00:01 UTC 2021 artifact\:guice-multibindings\#jar\#jar\#-1382091433.location=https\://repo1.maven.org/maven2/com/google/inject/extensions/guice-multibindings/4.0-beta5/guice-multibindings-4.0-beta5.jar artifact\:guice-multibindings\#pom.original\#pom\#270471229.is-local=false artifact\:guice-multibindings\#jar\#jar\#-1382091433.is-local=false diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..32cfc61d28 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.watcherExclude": { + "**/target": true + } +} \ No newline at end of file From e95cdd761057e032d84dbff6c21e946e86f105f8 Mon Sep 17 00:00:00 2001 From: itsyeonjoon Date: Tue, 23 Feb 2021 17:07:51 -0800 Subject: [PATCH 2/3] changed neighborhoodPolygonStyle and mouseoutStyle color to #606060 --- public/javascripts/Choropleths/MapUtilities.js | 2 +- public/javascripts/Progress/src/Progress.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/javascripts/Choropleths/MapUtilities.js b/public/javascripts/Choropleths/MapUtilities.js index c178446bcf..fc704273d5 100644 --- a/public/javascripts/Choropleths/MapUtilities.js +++ b/public/javascripts/Choropleths/MapUtilities.js @@ -3,7 +3,7 @@ */ function toggleLayers(label, checkboxId, sliderId, map, allLayers) { if (document.getElementById(checkboxId).checked) { - if(checkboxId === 'occlusion'){ + if(checkboxId === 'occlusion'){ a for (let i = 0; i < allLayers[label].length; i++) { if (!map.hasLayer(allLayers[label][i])) { map.addLayer(allLayers[label][i]); diff --git a/public/javascripts/Progress/src/Progress.js b/public/javascripts/Progress/src/Progress.js index 80166c61cb..932b6a1f02 100644 --- a/public/javascripts/Progress/src/Progress.js +++ b/public/javascripts/Progress/src/Progress.js @@ -2,10 +2,10 @@ function Progress (_, $, difficultRegionIds, userRole) { var params = { popupType: 'completionRate', neighborhoodPolygonStyle: { - color: '#888', + color: '#606060', weight: 2, opacity: 0.80, - fillColor: '#808080', + fillColor: '#606060', fillOpacity: 0.1 }, mouseoverStyle: { @@ -14,7 +14,7 @@ function Progress (_, $, difficultRegionIds, userRole) { weight: 3 }, mouseoutStyle: { - color: '#888', + color: '#606060', opacity: 0.8, weight: 2 }, From 797b8435e7a14e8b2ed8d06dc20b7055849b2d41 Mon Sep 17 00:00:00 2001 From: itsyeonjoon Date: Tue, 23 Feb 2021 17:22:19 -0800 Subject: [PATCH 3/3] changed colors --- public/javascripts/Progress/src/Progress.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/Progress/src/Progress.js b/public/javascripts/Progress/src/Progress.js index 932b6a1f02..106ea268b2 100644 --- a/public/javascripts/Progress/src/Progress.js +++ b/public/javascripts/Progress/src/Progress.js @@ -2,7 +2,7 @@ function Progress (_, $, difficultRegionIds, userRole) { var params = { popupType: 'completionRate', neighborhoodPolygonStyle: { - color: '#606060', + color: '#656565', weight: 2, opacity: 0.80, fillColor: '#606060', @@ -14,7 +14,7 @@ function Progress (_, $, difficultRegionIds, userRole) { weight: 3 }, mouseoutStyle: { - color: '#606060', + color: '#656565', opacity: 0.8, weight: 2 },