Download as
Browse Code »

Commit 47c4ef6c4b170d0042c76955e23bb0ba8fd4d070

Authored by Michel Felipe
2 parents 109f6263 aaca256f
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'master' of gitlab.com:participa/discussion-app

Showing 5 changed files with 12 additions and 19 deletions   Show diff stats
src/app/components/dialoga-service/dialoga.service.js
  Diff comments   View file @47c4ef6
... ... @@ -39,7 +39,7 @@
39 39 }else{
40 40 // load main content
41 41 ArticleService.getArticleById(API.articleId.home, {
42   - 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url'],
  42 + 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'amount_of_children'],
43 43 'content_type':'ProposalsDiscussionPlugin::DiscussionTopic'
44 44 }, function (data){
45 45 CACHE.home = data;
... ...
src/app/components/proposal-carousel/proposal-carousel.scss
  Diff comments   View file @47c4ef6
... ... @@ -59,7 +59,6 @@
59 59  
60 60 .join {
61 61 position: absolute;
62   - bottom: 32px;
63 62 z-index: 10;
64 63  
65 64 .btn {
... ...
src/app/index.scss
  Diff comments   View file @47c4ef6
... ... @@ -120,26 +120,17 @@ body {
120 120 border-right: 0;
121 121 border-top: 0;
122 122 border-radius: 6px;
  123 + background-color: #5e739d;
  124 + border-bottom: 3px solid #45506e;
123 125  
124 126 -webkit-transition: all $time ease-in-out;
125 127 -moz-transition: all $time ease-in-out;
126 128 -o-transition: all $time ease-in-out;
127 129 transition: all $time ease-in-out;
128 130  
129   - @each $category, $color in $categories {
130   - .#{$category} & {
131   - background-color: $color;
132   - border-bottom: 3px solid map-get($categories-complementary-2, $category);
133   - }
134   - }
135   -
136 131 &:hover,
137 132 &:focus {
138   - @each $category, $color in $categories {
139   - .#{$category} & {
140   - background-color: map-get($categories-complementary-2, $category);
141   - }
142   - }
  133 + background-color: #45506e;
143 134 }
144 135  
145 136 .contraste & {
... ... @@ -269,7 +260,10 @@ body {
269 260 // Theme
270 261 @each $category, $color in $categories {
271 262 .#{$category} {
272   - .color-theme-fg { color: $color; }
  263 + .color-theme-fg {
  264 + color: $color;
  265 + margin-top: 0px;
  266 + }
273 267 .color-theme-bg { background-color: $color;}
274 268 .color-theme-bg-complementar-1 { background-color: map-get($categories-complementary-1, $category);}
275 269 .color-theme-bg-complementar-2 { background-color: map-get($categories-complementary-2, $category);}
... ...
src/app/pages/programas/programa.controller.js
  Diff comments   View file @47c4ef6
... ... @@ -81,11 +81,12 @@
81 81 vm.article.bodyTrusted = vm.$sce.trustAsHtml(vm.article.body);
82 82 }
83 83  
  84 +
84 85 vm.loadingTopProposals = true;
85 86 vm.DialogaService.getProposalsByTopicId(vm.article.id, {
86 87 'limit': 5
87 88 }, function(data) {
88   - vm.total_proposals = parseInt(data._obj.headers('total'));
  89 + vm.total_proposals = parseInt(vm.article.amount_of_children);
89 90 vm.proposals = data.articles;
90 91 vm.proposalsTopFive = vm.proposals.slice(0, 5);
91 92 vm.proposalsTopRated = vm.proposals.slice(0, 3);
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @47c4ef6
... ... @@ -137,11 +137,10 @@
137 137 </div>
138 138 <div class="proposal-extended-section-content">
139 139 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
140   - <div class="row">
  140 + <div class="row text-center">
141 141 <div class="col-xs-12">
142 142 <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
143   - <span ng-if="pagePrograma.proposals.length > 1">Veja todas as {{pagePrograma.total_proposals}} propostas</span>
144   - <span ng-if="pagePrograma.proposals.length === 1">Ir para a página de ranking</span>
  143 + <span ng-if="pagePrograma.total_proposals > 5">Veja todas as {{pagePrograma.total_proposals}} propostas</span>
145 144 </a>
146 145 </div>
147 146 </div>
... ...