Download as
Browse Code »

Commit 0e565c29f9247b832af5dceedd96736ffb5b899a

Authored by Victor Costa
2 parents b26d7d9b 61160b10
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

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

Showing 3 changed files with 78 additions and 20 deletions   Show diff stats
index.html
  Diff comments   View file @0e565c2
... ... @@ -74,19 +74,34 @@
74 74 </div>
75 75 <div class='title'>{{title}}</div>
76 76 <div class='body'>{{body}}</div>
77   - <div class='make-proposal'>
78   - <div class='title'>Proponha</div>
79   - <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
80   - <input id="article_name" name="article[name]" type="text">
81   - <textarea id="article_abstract" name="article[abstract]"></textarea>
82   - <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
83   - <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
84   - <input type='submit' id='make-proposal-button' name='make-proposal-button' value='Submit'>
85   - </form>
  77 + <div class='make-proposal-container'>
  78 + <div class='make-proposal'>
  79 + <div class='title'>Faça Uma Proposta</div>
  80 + <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
  81 + <input id="article_name" name="article[name]" type="text">
  82 + <textarea id="article_abstract" name="article[abstract]"></textarea>
  83 + <label>Título</label>
  84 + <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
  85 + <label>Descrição</label>
  86 + <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
  87 + <input type='submit' id='make-proposal-button' name='make-proposal-button' value='Nova Proposta'>
  88 + </form>
  89 + </div>
  90 + </div>
  91 + <div class='support-proposal-container'>
  92 + </div>
  93 +<!--
  94 + <div class='experience-proposal-container'>
  95 + <div class='experience-proposal'>
  96 + <div class='title'>Conte sua experiência</div>
  97 + </div>
  98 + </div>
  99 + <div class='talk-proposal-container'>
  100 + <div class='talk-proposal'>
  101 + <div class='title'>Fale com o ministro</div>
  102 + </div>
86 103 </div>
87   - <div class='support-proposal-container'></div>
88   - <div class='experience-proposal'>Conte sua experiência</div>
89   - <div class='talk-proposal'>Fale com o ministro</div>
  104 +-->
90 105 </div>
91 106 </div>
92 107 {{/each}}
... ... @@ -95,6 +110,7 @@
95 110 <script id='support-proposal-template' type='text/x-handlebars-template'>
96 111 <div class='support-proposal'>
97 112 <div class='title'> Apoie outras propostas</div>
  113 + <div class='subtitle'> Propostas da sociedade</div>
98 114 <div class='author'>{{author.name}}</div>
99 115 <div class='abstract'>{{abstract}}</div>
100 116 <div class="vote-actions">
... ...
js/main.js
  Diff comments   View file @0e565c2
... ... @@ -59,6 +59,7 @@ $.getJSON(noosferoAPI)
59 59 $('#proposal-group').hide();
60 60 $('nav').hide();
61 61 $('#content').hide();
  62 + $(".abstract").dotdotdot();
62 63 $('.proposal-detail').hide();
63 64 $('#' + item).show();
64 65  
... ...
sass/_proposal_detail.scss
  Diff comments   View file @0e565c2
... ... @@ -18,21 +18,62 @@
18 18 weight: bold;
19 19 }
20 20 }
21   - .make-proposal{
  21 + .clear{
  22 + clear: both;
  23 + }
  24 + .make-proposal-container{
22 25 .title{
23 26 color: $color;
  27 + font-weight: bolder;
  28 + font-size: x-large;
  29 + margin: 10px;
  30 + }
  31 + width: 50%;
  32 + height: 200px;
  33 + float: left;
  34 + text-align: center;
  35 + .make-proposal{
  36 +// border: 1px solid $color;
  37 + margin: 2% 2% 2% 2%;
  38 + height: 100%;
24 39 }
25   - width: 49%;
26   - border: 1px solid $color;
27 40 }
28 41 .support-proposal-container{
29   - width: 49%;
  42 + .title{
  43 + color: $color;
  44 + font-weight: bolder;
  45 + font-size: x-large;
  46 + margin: 10px;
  47 + }
  48 + width: 50%;
  49 + float: left;
  50 + height: 200px;
  51 + text-align: center;
  52 + .support-proposal{
  53 +// border: 1px solid $color;
  54 + height: 100%;
  55 + margin: 2% 2% 2% 2%;
  56 + }
30 57 }
31   - .experience-proposal{
32   - width: 49%;
  58 + .experience-proposal-container{
  59 + float: left;
  60 + width: 50%;
  61 + height: 200px;
  62 + .experience-proposal{
  63 + border: 1px solid $color;
  64 + margin: 6% 2% 2% 2%;
  65 + height: 100%;
  66 + }
33 67 }
34   - .talk-proposal{
35   - width: 49%;
  68 + .talk-proposal-container{
  69 + width: 50%;
  70 + float: left;
  71 + height: 200px;
  72 + .talk-proposal{
  73 + border: 1px solid $color;
  74 + margin: 6% 2% 2% 2%;
  75 + height: 100%;
  76 + }
36 77  
37 78 }
38 79 li{
... ...