Download as
Browse Code »

Commit 5d5e870660f3b58c0a79af8bf6741866962ff161

Authored by Victor Costa
2 parents dbe049ea c69a96ce
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 40 additions and 8 deletions   Show diff stats
sass/_proposal_detail.scss
  Diff comments   View file @5d5e870
... ... @@ -12,6 +12,7 @@
12 12 padding: 15px 35px;
13 13 margin: 0;
14 14 width: 30%;
  15 + min-width: 210px;
15 16 display: inline-block;
16 17 span {
17 18 padding-left: 40px;
... ... @@ -230,7 +231,10 @@
230 231 input, textarea {
231 232 border-color: $color;
232 233 }
233   - .container-button a, input[type=submit] {
  234 + textarea#article_abstract {
  235 + height: 205px;
  236 + }
  237 + .container-button a, input[type=submit], .success-proposal-sent a {
234 238 font-weight: bolder;
235 239 font-size: 14px;
236 240 text-transform: uppercase;
... ... @@ -251,11 +255,11 @@
251 255 }
252 256 }
253 257 .make-proposal-container{
254   - .subtitle, .info {
  258 + .subtitle, .info, .success-proposal-sent {
255 259 margin: 20px;
256 260 color: #18376C;
257 261 }
258   - .subtitle {
  262 + .subtitle, .success-proposal-sent {
259 263 font-size: 24px;
260 264 font-weight: bold;
261 265 }
... ... @@ -268,6 +272,7 @@
268 272 width: 50%;
269 273 height: $container-height;
270 274 min-height: $container-height;
  275 + position: relative;
271 276 float: left;
272 277 text-align: left;
273 278 .make-proposal{
... ... @@ -279,8 +284,16 @@
279 284 .make-proposal-button{
280 285 @extend .container-button;
281 286 }
282   - .send-proposal-button {
  287 + .send-proposal-button, .success-proposal-sent {
283 288 @extend .container-button;
  289 + a {
  290 + position: absolute;
  291 + left: 50%;
  292 + margin: 0;
  293 + margin-left: -30%;
  294 + bottom: 40px;
  295 + padding: 20px 0;
  296 + }
284 297 }
285 298 #article_abstract {
286 299 height: 15%;
... ... @@ -294,6 +307,7 @@
294 307 float: left;
295 308 height: $container-height;
296 309 min-height: $container-height;
  310 + position: relative;
297 311 text-align: center;
298 312 .container-title {
299 313 text-align: center;
... ... @@ -302,6 +316,7 @@
302 316 border: 1px solid $color;
303 317 height: $container-height;
304 318 min-height: $container-height;
  319 + position: relative;
305 320 margin: 0 0 20px 10px;
306 321 }
307 322 .subtitle {
... ... @@ -327,14 +342,29 @@
327 342 color: white;
328 343 width: 60%;
329 344 border: none;
330   - margin: 20px auto;
  345 + margin: 0;
331 346 border-radius: 6px;
332 347 text-align: center;
333 348 text-decoration: none;
334   - padding: 20px;
  349 + padding: 20px 0;
335 350 display: block;
  351 + position: absolute;
  352 + bottom: 40px;
  353 + left: 50%;
  354 + margin-left: -30%;
336 355 }
337 356 .vote-result {
  357 + font-size: 14px;
  358 + font-weight: bold;
  359 + color: #333;
  360 + font-weight: bold;
  361 + text-decoration: none;
  362 + margin: 0;
  363 + display: block;
  364 + width: 100%;
  365 + text-align: center;
  366 + position: absolute;
  367 + bottom: 10px;
338 368 text-decoration: none;
339 369 color: $color;
340 370 }
... ... @@ -345,6 +375,7 @@
345 375 width: 50%;
346 376 height: $container-height;
347 377 min-height: $container-height;
  378 + position: relative;
348 379 text-align: center;
349 380 .experience-proposal{
350 381 border: 1px solid $color;
... ... @@ -366,6 +397,7 @@
366 397 float: left;
367 398 height: $container-height;
368 399 min-height: $container-height;
  400 + position: relative;
369 401 text-align: center;
370 402 .talk-proposal{
371 403 border: 1px solid $color;
... ...
sass/style.scss
  Diff comments   View file @5d5e870
... ... @@ -100,7 +100,7 @@ form {
100 100 }
101 101  
102 102 a {
103   - font-size: 12px;
  103 + font-size: 14px;
104 104 font-weight: bold;
105 105 color: #333;
106 106 font-weight: bold;
... ...
sass/utilities/_variables.scss
  Diff comments   View file @5d5e870
1 1 $categories: (saude: #00a9bd, seguranca: #e34748, educacao: #ffb400, reducao-da-pobreza: #51d0b3);
2 2 $categories-descriptions: (saude: "Saúde é direito de todos e dever do Estado. O Sistema Único de Saúde (SUS) é um dos maiores do mundo: atende 202 milhões de brasileiras e brasileiros.", seguranca: "Segurança Pública é direito fundamental, dever do Estado e responsabilidade de todos. A proteção da vida e a cultura de paz são nossos compromissos.", educacao: "O Brasil avançou na qualidade e ampliou o acesso à educação em todos os níveis. Agora, o Plano Nacional de Educação (PNE) definiu metas quantitativas e qualitativas para os próximos 10 anos.", reducao-da-pobreza: "Este governo escolheu como prioridade combater a pobreza e reduzir as desigualdades sociais. Por isso, o Brasil saiu do Mapa da Fome das Nações Unidas");
3   -$container-height: 400px;
  3 +$container-height: 500px;
... ...