Commit e7ad7849b3ef685639d4c5c0bef7b323255e2afa
Exists in
master
and in
5 other branches
Merge branch 'fix-306'
Showing
12 changed files
with
22 additions
and
15 deletions
Show diff stats
4.29 KB
4.4 KB
4.33 KB
3.86 KB
images/icons/icon-login-success.png
3.2 KB
3.53 KB
3.63 KB
3.53 KB
3.15 KB
images/icons/icon-proposal-sent.png
2.89 KB
js/main.js
| @@ -760,7 +760,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -760,7 +760,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
| 760 | } | 760 | } |
| 761 | })(); | 761 | })(); |
| 762 | 762 | ||
| 763 | - // Load data from localhost when it is dev env. | 763 | + |
| 764 | var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + Main.private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position'; | 764 | var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + Main.private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position'; |
| 765 | 765 | ||
| 766 | $.getJSON(noosferoAPI) | 766 | $.getJSON(noosferoAPI) |
| @@ -929,20 +929,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | @@ -929,20 +929,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F | ||
| 929 | message.text('Não foi possível enviar.'); | 929 | message.text('Não foi possível enviar.'); |
| 930 | }); | 930 | }); |
| 931 | }); | 931 | }); |
| 932 | - | ||
| 933 | - | ||
| 934 | - | ||
| 935 | }) | 932 | }) |
| 936 | .fail(function( jqxhr, textStatus, error ) { | 933 | .fail(function( jqxhr, textStatus, error ) { |
| 937 | var err = textStatus + ', ' + error; | 934 | var err = textStatus + ', ' + error; |
| 938 | console.log( 'Request Failed: ' + err ); | 935 | console.log( 'Request Failed: ' + err ); |
| 939 | }); | 936 | }); |
| 940 | 937 | ||
| 941 | - // window.addEventListener('load', function() { | ||
| 942 | - // new FastClick(document.body); | ||
| 943 | - // }, false); | ||
| 944 | - | ||
| 945 | - | ||
| 946 | $(document).ready(function($) { | 938 | $(document).ready(function($) { |
| 947 | 939 | ||
| 948 | FastClick.attach(document.body); | 940 | FastClick.attach(document.body); |
sass/style.sass
| @@ -317,16 +317,31 @@ textarea | @@ -317,16 +317,31 @@ textarea | ||
| 317 | width: 71px | 317 | width: 71px |
| 318 | background: url(images/icons/icon-user-created.png) no-repeat 50% 50% | 318 | background: url(images/icons/icon-user-created.png) no-repeat 50% 50% |
| 319 | border-radius: 0 | 319 | border-radius: 0 |
| 320 | - &-login-success | ||
| 321 | - height: 71px | ||
| 322 | - width: 71px | ||
| 323 | - background: url(images/icons/icon-login-success.png) no-repeat 50% 50% | ||
| 324 | - border-radius: 0 | 320 | + &-login-success, |
| 325 | &-proposal-sent | 321 | &-proposal-sent |
| 326 | height: 71px | 322 | height: 71px |
| 327 | width: 71px | 323 | width: 71px |
| 328 | - background: url(images/icons/icon-proposal-sent.png) no-repeat 50% 50% | 324 | + background-repeat: no-repeat |
| 325 | + background-position: 50% 50% | ||
| 329 | border-radius: 0 | 326 | border-radius: 0 |
| 327 | + &-login-success | ||
| 328 | + .saude & | ||
| 329 | + background-image: url(images/icons/icon-login-success-blue.png) | ||
| 330 | + .seguranca-publica & | ||
| 331 | + background-image: url(images/icons/icon-login-success-red.png) | ||
| 332 | + .educacao & | ||
| 333 | + background-image: url(images/icons/icon-login-success-yellow.png) | ||
| 334 | + .reducao-da-pobreza & | ||
| 335 | + background-image: url(images/icons/icon-login-success-green.png) | ||
| 336 | + &-proposal-sent | ||
| 337 | + .saude & | ||
| 338 | + background-image: url(images/icons/icon-proposal-sent-blue.png) | ||
| 339 | + .seguranca-publica & | ||
| 340 | + background-image: url(images/icons/icon-proposal-sent-red.png) | ||
| 341 | + .educacao & | ||
| 342 | + background-image: url(images/icons/icon-proposal-sent-yellow.png) | ||
| 343 | + .reducao-da-pobreza & | ||
| 344 | + background-image: url(images/icons/icon-proposal-sent-green.png) | ||
| 330 | 345 | ||
| 331 | 346 | ||
| 332 | // ------------------------------------ | 347 | // ------------------------------------ |