Download as
Browse Code »

Commit ddbe93cb11e29b782da1af623e0949ada0db39a5

Authored by Leonardo Merlin
2 parents 95e102a7 7c878983
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'fix-issues'

Showing 4 changed files with 5 additions and 7 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @ddbe93c
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 190
191 var url = service.apiCommunities + community_id + '/articles'; 191 var url = service.apiCommunities + community_id + '/articles';
192 var paramsExtended = angular.extend({ 192 var paramsExtended = angular.extend({
193 - // 'fields[]': ['id', 'title', 'abstract', 'body', 'categories', 'created_at', 'start_date', 'end_date', 'followers_count', 'image', 'url'], 193 + 'fields[]': ['id', 'title', 'abstract', 'body', 'setting', 'presenter', 'created_at', 'update_at', 'start_date', 'end_date', 'followers_count', 'image', 'url'],
194 'content_type':'Event' 194 'content_type':'Event'
195 }, params); 195 }, params);
196 196
src/app/components/event-list/event-list.scss
  Diff comments   View file @ddbe93c
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 .event-list--panel { 12 .event-list--panel {
13 color: #484848; 13 color: #484848;
14 width: 100%; 14 width: 100%;
15 - height: 240px; 15 + height: 225px;
16 margin: 8px 0; 16 margin: 8px 0;
17 padding: 0 20px; 17 padding: 0 20px;
18 overflow-x: hidden; 18 overflow-x: hidden;
src/app/pages/inicio/inicio.html
  Diff comments   View file @ddbe93c
@@ -22,15 +22,13 @@ @@ -22,15 +22,13 @@
22 </div> 22 </div>
23 <div class="col-md-4" ng-if="pageInicio.featuredEvent"> 23 <div class="col-md-4" ng-if="pageInicio.featuredEvent">
24 <div class="row"> 24 <div class="row">
25 - <div class="featured-event--box"> 25 + <div class="featured-event--box" ng-click="pageInicio.showEventVideo()">
26 <div class="box-top col-xs-12 col-sm-4 col-md-12"> 26 <div class="box-top col-xs-12 col-sm-4 col-md-12">
27 <h2 class="box-title">Bate papo com <b>MINISTROS/AS</b></h2> 27 <h2 class="box-title">Bate papo com <b>MINISTROS/AS</b></h2>
28 </div> 28 </div>
29 <div class="box-middle col-xs-12 col-sm-4 col-md-12"> 29 <div class="box-middle col-xs-12 col-sm-4 col-md-12">
30 <div class="video" 30 <div class="video"
31 - ng-style="{'background-image': 'url(' + pageInicio.featuredEvent.image.url + ')'}"  
32 - ng-click="pageInicio.showEventVideo()"  
33 - > 31 + ng-style="{'background-image': 'url(' + pageInicio.featuredEvent.image.url + ')'}">
34 </div> 32 </div>
35 </div> 33 </div>
36 <div class="box-bottom col-xs-12 col-sm-4 col-md-12"> 34 <div class="box-bottom col-xs-12 col-sm-4 col-md-12">
src/app/pages/inicio/inicio.scss
  Diff comments   View file @ddbe93c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 background-color: #545454; 35 background-color: #545454;
36 color: #fff; 36 color: #fff;
37 border-radius: 5px; 37 border-radius: 5px;
  38 + cursor: pointer;
38 39
39 .box-top { 40 .box-top {
40 text-transform: uppercase; 41 text-transform: uppercase;
@@ -53,7 +54,6 @@ @@ -53,7 +54,6 @@
53 padding: 0; 54 padding: 0;
54 55
55 .video { 56 .video {
56 - cursor: pointer;  
57 width: 100%; 57 width: 100%;
58 min-height: 125px; 58 min-height: 125px;
59 background-size: cover; 59 background-size: cover;