diff --git a/src/app/components/programas/programas.directive.js b/src/app/components/programas/programas.directive.js index d7cb9ba..e21c3ad 100644 --- a/src/app/components/programas/programas.directive.js +++ b/src/app/components/programas/programas.directive.js @@ -62,6 +62,11 @@ vm.$scope.$watch('vm.query', function(newValue/*, oldValue*/) { vm.search.filtro = newValue ? newValue : null; vm.$location.search('filtro', vm.search.filtro); + if(vm.search.filtro){ + vm.limitTo = vm.programs.length; + }else{ + vm.limitTo = vm.defaultLimit; + } vm.filtredProgramList = vm.getFiltredPrograms(); }); @@ -74,6 +79,9 @@ vm.$scope.$watch('vm.categoryFilter', function(newValue/*, oldValue*/) { vm.search.tema = newValue ? newValue.slug : null; vm.$location.search('tema', vm.search.tema); + if(vm.search.tema){ + vm.limitTo = vm.programs.length; + } vm.filtredProgramList = vm.getFiltredPrograms(); }); diff --git a/src/app/components/programas/programas.html b/src/app/components/programas/programas.html index 9d2d9bb..fd5df26 100644 --- a/src/app/components/programas/programas.html +++ b/src/app/components/programas/programas.html @@ -22,7 +22,7 @@
-

Programas

+

Programas ({{vm.filtredProgramList.length}}/{{::vm.programs.length}})

diff --git a/src/app/components/programas/programas.scss b/src/app/components/programas/programas.scss index 0c55e64..3a933e0 100644 --- a/src/app/components/programas/programas.scss +++ b/src/app/components/programas/programas.scss @@ -34,23 +34,42 @@ font-weight: bold; padding: 0; height: 68px; + overflow: hidden; } .category-list--label { margin-left: 70px; margin-right: 30px; display: inline-block; + z-index: 99999; } - .category-list--icon-circle { + &--icon-circle { width: 48px; height: 48px; position: absolute; top: 10px; left: 10px; - border: 1px solid #fff; + // border: 1px solid #fff; border-radius: 48px; + -webkit-transition: -webkit-transform 0.2s ease-in-out; + -moz-transition: -moz-transform 0.2s ease-in-out; + -o-transition: -o-transform 0.2s ease-in-out; + transition: transform 0.2s ease-in-out; + + // -webkit-transition: all 0.2s ease-in-out; + // -moz-transition: all 0.2s ease-in-out; + // -o-transition: all 0.2s ease-in-out; + // transition: all 0.2s ease-in-out; + + z-index: 0; + + .active & { + transform: scale(15); + z-index: -1; + } + @each $category, $color in $categories { &.#{$category} { background-color: $color; @@ -73,13 +92,19 @@ transform: scale(1.4); } - @each $category, $color in $categories { - &.#{$category} { - .list-group-item.active, - .list-group-item.active:hover, - .list-group-item.active:focus { - background-color: $color; - } - } + .list-group-item.active, + .list-group-item.active:hover, + .list-group-item.active:focus { + background-color: #f5f5f5; } + + // @each $category, $color in $categories { + // &.#{$category} { + // .list-group-item.active, + // .list-group-item.active:hover, + // .list-group-item.active:focus { + // background-color: $color; + // } + // } + // } } -- libgit2 0.21.2