Fix carto counts and map colors
authorChloe Laisne <chloe.laisne@gmail.com>
Tue, 18 Oct 2016 18:05:11 +0530
changeset 355 83f5247f3c7a
parent 352 d8a8c57f36c4
child 356 139bf74b9374
Fix carto counts and map colors
cms/app-client/app/components/visu-carto.js
cms/app-client/app/serializers/geostat.js
cms/app-client/app/styles/app.scss
--- a/cms/app-client/app/components/visu-carto.js	Tue Oct 18 14:42:01 2016 +0530
+++ b/cms/app-client/app/components/visu-carto.js	Tue Oct 18 18:05:11 2016 +0530
@@ -69,7 +69,7 @@
     init: function() {
         this._super(...arguments);
         if (ENV.environment === 'development') {
-            this.set('color', 'rgba(141,113,113,.2)');
+            this.set('color', '#f3f3f3');
         }
     },
 
@@ -167,11 +167,12 @@
             'areasSettings': {
                 'autoZoom': false,
                 'selectable': true,
-                'color': '#becfd4',
-                'colorSolid': '#71848d',
+                'color': '#777777',
+                'colorSolid': '#333333',
                 'colorOutline': '#253946',
-                'selectedColor': '#253946',
-                'rollOverOutlineColor': '#253946'
+                'selectedColor': '#0085cb',
+                'rollOverColor': '#0085cb',
+                'rollOverOutlineColor': '#ffffff'
             },
             'zoomControl': {
                 'zoomControlEnabled': false,
--- a/cms/app-client/app/serializers/geostat.js	Tue Oct 18 14:42:01 2016 +0530
+++ b/cms/app-client/app/serializers/geostat.js	Tue Oct 18 18:05:11 2016 +0530
@@ -9,7 +9,7 @@
                 'id': key,
                 'type': 'geostat',
                 'attributes': {
-                    'count': payload[key]
+                    'count': payload['geostats'][key]
                 }
             });
         });
--- a/cms/app-client/app/styles/app.scss	Tue Oct 18 14:42:01 2016 +0530
+++ b/cms/app-client/app/styles/app.scss	Tue Oct 18 18:05:11 2016 +0530
@@ -80,7 +80,7 @@
 .corpus-app-container {
     color: $dark-grey;
     box-sizing: border-box;
-    background-color: $medium-white;
+    background-color: $corpus-white;
     position: relative;
 }
 
@@ -120,8 +120,8 @@
 }
 
 .corpus-app-wrapper {
-    background-color: $medium-blue;
-    box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.8);
+    background-color: $corpus-light-grey;
+    border-left: 1px solid $corpus-black; 
     position: relative;
 }