Commit f497cb1c9674f326af8e509a21ec0e0ad4d75a90
1 parent
fdc623ba
Exists in
master
and in
5 other branches
Proposal-box fixed
Showing
3 changed files
with
32 additions
and
20 deletions
Show diff stats
js/handlebars-helpers.js
| @@ -35,7 +35,7 @@ define(['handlebars'], function(Handlebars){ | @@ -35,7 +35,7 @@ define(['handlebars'], function(Handlebars){ | ||
| 35 | if(element == ''){ | 35 | if(element == ''){ |
| 36 | continue; | 36 | continue; |
| 37 | } | 37 | } |
| 38 | - category = category + '</div>' + '<div class="box-body">' + '<img src="' + options.hash['host'] + proposal.image.url + '" alt="Imagem de apresentação do programa."/>' + proposal.title + (proposal.abstract ? proposal.abstract : '') + '</div>'; | 38 | + category = category + '</div>' + '<div class="box-body">' + '<img src="' + options.hash['host'] + proposal.image.url + '" alt="Imagem de apresentação do programa."/>' + proposal.title + (proposal.abstract ? proposal.abstract : '') + '<span class="button participe">OPINE NESTE PROGRAMA</span></div>'; |
| 39 | // element = element + options.fn(proposal); | 39 | // element = element + options.fn(proposal); |
| 40 | 40 | ||
| 41 | element = element + category; | 41 | element = element + category; |
novo.css
| @@ -51,7 +51,8 @@ blockquote { | @@ -51,7 +51,8 @@ blockquote { | ||
| 51 | display: none; } | 51 | display: none; } |
| 52 | 52 | ||
| 53 | .button, .button-cancela, .login input.button, .signup input.button { | 53 | .button, .button-cancela, .login input.button, .signup input.button { |
| 54 | - border-bottom: 3px solid #000; | 54 | + background-color: #387bf9; |
| 55 | + border-bottom: 3px solid #0751de; | ||
| 55 | border-left: 0; | 56 | border-left: 0; |
| 56 | border-right: 0; | 57 | border-right: 0; |
| 57 | border-top: 0; | 58 | border-top: 0; |
| @@ -59,7 +60,7 @@ blockquote { | @@ -59,7 +60,7 @@ blockquote { | ||
| 59 | color: #fff; | 60 | color: #fff; |
| 60 | cursor: pointer; | 61 | cursor: pointer; |
| 61 | display: block; | 62 | display: block; |
| 62 | - font-size: 16px; | 63 | + font-size: 14px; |
| 63 | font-weight: 700; | 64 | font-weight: 700; |
| 64 | padding-bottom: 15px; | 65 | padding-bottom: 15px; |
| 65 | padding-left: 0; | 66 | padding-left: 0; |
| @@ -68,7 +69,7 @@ blockquote { | @@ -68,7 +69,7 @@ blockquote { | ||
| 68 | text-align: center; | 69 | text-align: center; |
| 69 | transition: all 400ms; } | 70 | transition: all 400ms; } |
| 70 | .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover { | 71 | .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover { |
| 71 | - background-color: black; | 72 | + background-color: #0751de; |
| 72 | text-decoration: none; } | 73 | text-decoration: none; } |
| 73 | .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover, .button:focus, .button-cancela:focus, .login input.button:focus, .signup input.button:focus { | 74 | .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover, .button:focus, .button-cancela:focus, .login input.button:focus, .signup input.button:focus { |
| 74 | color: #fff; } | 75 | color: #fff; } |
| @@ -308,9 +309,8 @@ h1 { | @@ -308,9 +309,8 @@ h1 { | ||
| 308 | border-radius: 3px; | 309 | border-radius: 3px; |
| 309 | color: #000; | 310 | color: #000; |
| 310 | display: block; | 311 | display: block; |
| 311 | - height: 200px; | ||
| 312 | margin-top: 30px; | 312 | margin-top: 30px; |
| 313 | - overflow: auto; | 313 | + overflow: hidden; |
| 314 | transition: all 400ms; | 314 | transition: all 400ms; |
| 315 | transition: all 400ms; } | 315 | transition: all 400ms; } |
| 316 | .box:hover { | 316 | .box:hover { |
| @@ -319,7 +319,6 @@ h1 { | @@ -319,7 +319,6 @@ h1 { | ||
| 319 | .box:hover { | 319 | .box:hover { |
| 320 | text-decoration: none; } | 320 | text-decoration: none; } |
| 321 | .box p { | 321 | .box p { |
| 322 | - border-bottom: 1px dotted #000; | ||
| 323 | padding-bottom: 15px; } | 322 | padding-bottom: 15px; } |
| 324 | .box-propostas { | 323 | .box-propostas { |
| 325 | height: auto; | 324 | height: auto; |
| @@ -337,14 +336,21 @@ h1 { | @@ -337,14 +336,21 @@ h1 { | ||
| 337 | border-bottom: 0; | 336 | border-bottom: 0; |
| 338 | padding-bottom: inherit; } | 337 | padding-bottom: inherit; } |
| 339 | .box-header { | 338 | .box-header { |
| 340 | - color: #335277; | ||
| 341 | - font-family: asap, sans; | ||
| 342 | - font-size: 24px; | 339 | + color: #000; |
| 340 | + font-size: 18px; | ||
| 343 | font-weight: 700; } | 341 | font-weight: 700; } |
| 344 | .box-header p { | 342 | .box-header p { |
| 345 | - font-size: 14px; } | 343 | + font-size: 14px; |
| 344 | + font-weight: 500; | ||
| 345 | + margin-top: 10px; } | ||
| 346 | .box-body { | 346 | .box-body { |
| 347 | padding: 20px; } | 347 | padding: 20px; } |
| 348 | + .box-body img { | ||
| 349 | + margin-left: -20px; | ||
| 350 | + margin-right: -20px; | ||
| 351 | + margin-top: -20px; | ||
| 352 | + margin-bottom: 20px; | ||
| 353 | + max-width: 120%; } | ||
| 348 | .box-category { | 354 | .box-category { |
| 349 | font-size: 14px; | 355 | font-size: 14px; |
| 350 | font-weight: 700; | 356 | font-weight: 700; |
sass/novo.sass
| @@ -139,7 +139,8 @@ blockquote | @@ -139,7 +139,8 @@ blockquote | ||
| 139 | display: none | 139 | display: none |
| 140 | 140 | ||
| 141 | .button | 141 | .button |
| 142 | - border-bottom: 3px solid #000 | 142 | + background-color: #387bf9 |
| 143 | + border-bottom: 3px solid darken(#387bf9, $darken) | ||
| 143 | border-left: 0 | 144 | border-left: 0 |
| 144 | border-right: 0 | 145 | border-right: 0 |
| 145 | border-top: 0 | 146 | border-top: 0 |
| @@ -147,14 +148,14 @@ blockquote | @@ -147,14 +148,14 @@ blockquote | ||
| 147 | color: #fff | 148 | color: #fff |
| 148 | cursor: pointer | 149 | cursor: pointer |
| 149 | display: block | 150 | display: block |
| 150 | - font-size: $font-size-base | 151 | + font-size: $font-size-small |
| 151 | font-weight: 700 | 152 | font-weight: 700 |
| 152 | padding-bottom: $gutter * 0.75 | 153 | padding-bottom: $gutter * 0.75 |
| 153 | padding-left: 0 | 154 | padding-left: 0 |
| 154 | padding-right: 0 | 155 | padding-right: 0 |
| 155 | padding-top: $gutter * 0.75 | 156 | padding-top: $gutter * 0.75 |
| 156 | text-align: center | 157 | text-align: center |
| 157 | - +hover(#000,$darken) | 158 | + +hover(#387bf9,$darken) |
| 158 | &:hover, &:focus | 159 | &:hover, &:focus |
| 159 | color: #fff | 160 | color: #fff |
| 160 | &-inline | 161 | &-inline |
| @@ -390,15 +391,13 @@ h1 | @@ -390,15 +391,13 @@ h1 | ||
| 390 | border-radius: $radius | 391 | border-radius: $radius |
| 391 | color: #000 | 392 | color: #000 |
| 392 | display: block | 393 | display: block |
| 393 | - height: 200px | ||
| 394 | margin-top: $gutter * 1.5 | 394 | margin-top: $gutter * 1.5 |
| 395 | - overflow: auto | 395 | + overflow: hidden |
| 396 | transition: all 400ms | 396 | transition: all 400ms |
| 397 | +hover(#fff,$darken) | 397 | +hover(#fff,$darken) |
| 398 | &:hover | 398 | &:hover |
| 399 | text-decoration: none | 399 | text-decoration: none |
| 400 | p | 400 | p |
| 401 | - border-bottom: 1px dotted #000 | ||
| 402 | padding-bottom: $gutter * 0.75 | 401 | padding-bottom: $gutter * 0.75 |
| 403 | &-propostas | 402 | &-propostas |
| 404 | height: auto | 403 | height: auto |
| @@ -418,14 +417,21 @@ h1 | @@ -418,14 +417,21 @@ h1 | ||
| 418 | border-bottom: 0 | 417 | border-bottom: 0 |
| 419 | padding-bottom: inherit | 418 | padding-bottom: inherit |
| 420 | &-header | 419 | &-header |
| 421 | - color: $link-color | ||
| 422 | - font-family: asap, sans | ||
| 423 | - font-size: $theme-size-header | 420 | + color: #000 |
| 421 | + font-size: $font-size-big | ||
| 424 | font-weight: 700 | 422 | font-weight: 700 |
| 425 | p | 423 | p |
| 426 | font-size: $font-size-small | 424 | font-size: $font-size-small |
| 425 | + font-weight: 500 | ||
| 426 | + margin-top: $gutter * 0.5 | ||
| 427 | &-body | 427 | &-body |
| 428 | padding: $gutter | 428 | padding: $gutter |
| 429 | + img | ||
| 430 | + margin-left: $gutter * (-1) | ||
| 431 | + margin-right: $gutter * (-1) | ||
| 432 | + margin-top: $gutter * (-1) | ||
| 433 | + margin-bottom: $gutter | ||
| 434 | + max-width: 120% | ||
| 429 | &-category | 435 | &-category |
| 430 | font-size: $font-size-small | 436 | font-size: $font-size-small |
| 431 | font-weight: 700 | 437 | font-weight: 700 |