--- a/cms/app-client/app/components/sorting-component.js Tue Oct 18 15:03:01 2016 +0200
+++ b/cms/app-client/app/components/sorting-component.js Tue Oct 18 18:46:45 2016 +0530
@@ -18,6 +18,7 @@
themesObserver: Ember.observer('themes.@each', function() {
this.$('ul').on('scroll', Ember.run.bind(this, this.scrolling));
}),
+
scrolling: function(event) {
if(Ember.$(event.target).scrollTop() !== 0 ) {
if(Ember.$(event.target).scrollTop() + Ember.$(event.target).height() > Ember.$(event.target).get(0).scrollHeight - 50) {
--- a/cms/app-client/app/components/visu-carto.js Tue Oct 18 15:03:01 2016 +0200
+++ b/cms/app-client/app/components/visu-carto.js Tue Oct 18 18:46:45 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 15:03:01 2016 +0200
+++ b/cms/app-client/app/serializers/geostat.js Tue Oct 18 18:46:45 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 15:03:01 2016 +0200
+++ b/cms/app-client/app/styles/app.scss Tue Oct 18 18:46:45 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;
}
--- a/cms/app-client/app/styles/components/filter-component.scss Tue Oct 18 15:03:01 2016 +0200
+++ b/cms/app-client/app/styles/components/filter-component.scss Tue Oct 18 18:46:45 2016 +0530
@@ -55,7 +55,11 @@
display: inline-block;
}
-.filter-component ul li .label a {
+.filter-component ul li .ember-view a {
+ pointer-events: none;
+}
+
+.filter-component ul li a {
text-decoration: none;
text-transform: capitalize;
color: inherit;
--- a/cms/app-client/app/styles/components/sorting-component.scss Tue Oct 18 15:03:01 2016 +0200
+++ b/cms/app-client/app/styles/components/sorting-component.scss Tue Oct 18 18:46:45 2016 +0530
@@ -1,14 +1,15 @@
.sorting-component {
+ overflow: auto;
position: relative;
- height: calc(100% - 114px);
- margin-top: 54px;
+ height: 100%;
}
.sorting-component div.options {
text-align: right;
- color: $medium-blue;
+ color: $corpus-black;
font-size: 13px;
- line-height: 40px;
+ line-height: normal;
+ margin-top: 35px;
}
.sorting-component ul {
@@ -25,7 +26,7 @@
}
.sorting-component div.tags {
- color: $dark-grey;
+ color: $corpus-grey;
}
.sorting-component div.tags ul {
@@ -74,7 +75,7 @@
}
.sorting-component div.tags ul li.selected {
- color: $medium-blue;
+ color: $corpus-black;
font-size: 20px
}
@@ -90,11 +91,11 @@
font-size: 13px;
height: 32px;
line-height: 32px;
- background-color: $medium-blue;
- color: $light-white;
+ background-color: $corpus-black;
+ color: $corpus-white;
cursor: pointer;
+ position: absolute;
+ bottom: 35px;
left: 50%;
- transform: translate(-50%, 0);
- position: absolute;
- bottom: 14px;
+ transform: translateX(-50%);
}