Download as
Browse Code »

Commit c5bd7f8fe3e0abaacce1fa1d0e5c44e5f42d9c31

Authored by Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents 927f5753 8dccef8d
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'list-group-mobile'

Showing 3 changed files with 7 additions and 2 deletions   Show diff stats
src/app/components/category-list/category-list.directive.js
  Diff comments   View file @c5bd7f8
@@ -85,7 +85,6 @@ @@ -85,7 +85,6 @@
85 if(!vm._listGroup){ 85 if(!vm._listGroup){
86 vm._listGroup = vm.$element.find('.list-group'); 86 vm._listGroup = vm.$element.find('.list-group');
87 } 87 }
88 -  
89 vm._listGroup.slideToggle(); 88 vm._listGroup.slideToggle();
90 }; 89 };
91 90
src/app/components/category-list/category-list.html
  Diff comments   View file @c5bd7f8
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span> 6 <b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span>
7 </h3> 7 </h3>
8 <!-- <div class="list-group ng-hide" ng-show="!vm.isCollapsed" ng-class="vm.selectedCategory.slug"> --> 8 <!-- <div class="list-group ng-hide" ng-show="!vm.isCollapsed" ng-class="vm.selectedCategory.slug"> -->
9 - <div class="list-group" ng-class="vm.selectedCategory.slug"> 9 + <div class="list-group is-mobile" ng-class="vm.selectedCategory.slug">
10 <button type="button" class="list-group-item category-list--item" 10 <button type="button" class="list-group-item category-list--item"
11 ng-repeat="category in vm.categories" 11 ng-repeat="category in vm.categories"
12 ng-class="{active: vm.selectedCategory.slug === category.slug}" 12 ng-class="{active: vm.selectedCategory.slug === category.slug}"
src/app/components/category-list/category-list.scss
  Diff comments   View file @c5bd7f8
@@ -124,6 +124,12 @@ @@ -124,6 +124,12 @@
124 // height: 0; 124 // height: 0;
125 // line-height: 0; 125 // line-height: 0;
126 } 126 }
  127 +
  128 + &.is-mobile {
  129 + @media(max-width: $screen-sm) {
  130 + display: none;
  131 + }
  132 + }
127 } 133 }
128 134
129 .list-group-item.active, 135 .list-group-item.active,