Download as
Browse Code »

Commit 11c5d473fdb12e0edb419921a337bf8b04317ea5

Authored by Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents 56344bed c5bd7f8f
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 5 changed files with 27 additions and 4 deletions   Show diff stats
src/app/components/category-list/category-list.directive.js
  Diff comments   View file @11c5d47
... ... @@ -85,7 +85,6 @@
85 85 if(!vm._listGroup){
86 86 vm._listGroup = vm.$element.find('.list-group');
87 87 }
88   -
89 88 vm._listGroup.slideToggle();
90 89 };
91 90  
... ...
src/app/components/category-list/category-list.html
  Diff comments   View file @11c5d47
... ... @@ -6,7 +6,7 @@
6 6 <b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span>
7 7 </h3>
8 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 10 <button type="button" class="list-group-item category-list--item"
11 11 ng-repeat="category in vm.categories"
12 12 ng-class="{active: vm.selectedCategory.slug === category.slug}"
... ...
src/app/components/category-list/category-list.scss
  Diff comments   View file @11c5d47
... ... @@ -124,6 +124,12 @@
124 124 // height: 0;
125 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 135 .list-group-item.active,
... ...
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @11c5d47
... ... @@ -141,7 +141,7 @@
141 141 <div class="proposal-box--program color-theme-bg">{{vm.topic.title}}</div>
142 142  
143 143 <!-- Apagar o bloco abaixo -->
144   - <span style="background: green;">{{::vm.proposal.body}}
  144 + <span style="background: green;">{{::vm.proposal}}
145 145 </div>
146 146 <div class="proposal-box--middle">
147 147 <div class="proposal-box--content">
... ...
src/app/pages/respostas/respostas.controller.js
  Diff comments   View file @11c5d47
... ... @@ -169,7 +169,25 @@
169 169 var params = {
170 170 page: page,
171 171 per_page: per_page,
172   - has_children: true
  172 + has_children: true,
  173 + 'fields[]': [
  174 + 'id',
  175 + 'body',
  176 + 'abstract',
  177 + 'hits',
  178 + 'ranking_position',
  179 + 'votes_against',
  180 + 'votes_count',
  181 + 'votes_for',
  182 + 'parent',
  183 + 'categories',
  184 + 'slug',
  185 + 'url', // parent.image.url
  186 + 'image',
  187 + 'title',
  188 + 'archived',
  189 + 'has_children',
  190 + ]
173 191 };
174 192  
175 193 if (vm.selectedTheme) {
... ...