# HG changeset patch # User Chloe Laisne # Date 1476796530 -19800 # Node ID 139bf74b93740e64b75467812d0365a2e07861b7 # Parent 83f5247f3c7a0c1d62c337d9a2fee580a430ed5e Theme section colors diff -r 83f5247f3c7a -r 139bf74b9374 cms/app-client/app/components/sorting-component.js --- a/cms/app-client/app/components/sorting-component.js Tue Oct 18 18:05:11 2016 +0530 +++ b/cms/app-client/app/components/sorting-component.js Tue Oct 18 18:45:30 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) { diff -r 83f5247f3c7a -r 139bf74b9374 cms/app-client/app/styles/components/filter-component.scss --- a/cms/app-client/app/styles/components/filter-component.scss Tue Oct 18 18:05:11 2016 +0530 +++ b/cms/app-client/app/styles/components/filter-component.scss Tue Oct 18 18:45:30 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; diff -r 83f5247f3c7a -r 139bf74b9374 cms/app-client/app/styles/components/sorting-component.scss --- a/cms/app-client/app/styles/components/sorting-component.scss Tue Oct 18 18:05:11 2016 +0530 +++ b/cms/app-client/app/styles/components/sorting-component.scss Tue Oct 18 18:45:30 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%); }