Commit b60b873a9a2cd06784fb7cc6420dfc1f995d28b3
Exists in
master
and in
10 other branches
Merge branch 'fix-26' into 'master'
Fix 26 - Conteudo colado com o final da página Adiciona margin ao wrapper do conteúdo (#proposal-result) See merge request !10
Showing
3 changed files
with
6 additions
and
5 deletions
Show diff stats
index.html
sass/_proposal_detail.scss
| @@ -379,8 +379,8 @@ | @@ -379,8 +379,8 @@ | ||
| 379 | .experience-proposal-container{ | 379 | .experience-proposal-container{ |
| 380 | float: left; | 380 | float: left; |
| 381 | width: 50%; | 381 | width: 50%; |
| 382 | - height: $container-height; | ||
| 383 | - min-height: $container-height; | 382 | + // height: $container-height; |
| 383 | + // min-height: $container-height; | ||
| 384 | position: relative; | 384 | position: relative; |
| 385 | text-align: center; | 385 | text-align: center; |
| 386 | .experience-proposal{ | 386 | .experience-proposal{ |
| @@ -413,8 +413,8 @@ | @@ -413,8 +413,8 @@ | ||
| 413 | .talk-proposal-container{ | 413 | .talk-proposal-container{ |
| 414 | width: 50%; | 414 | width: 50%; |
| 415 | float: left; | 415 | float: left; |
| 416 | - height: $container-height; | ||
| 417 | - min-height: $container-height; | 416 | + // height: $container-height; |
| 417 | + // min-height: $container-height; | ||
| 418 | position: relative; | 418 | position: relative; |
| 419 | text-align: center; | 419 | text-align: center; |
| 420 | .talk-proposal { | 420 | .talk-proposal { |