Download as
Browse Code »

Commit b60b873a9a2cd06784fb7cc6420dfc1f995d28b3

Authored by Leonardo Merlin
2 parents c3700330 201faa0c
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

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
  Diff comments   View file @b60b873
... ... @@ -173,6 +173,7 @@
173 173 </div>
174 174 </div>
175 175 </div>
  176 + <div class="clearfix"></div>
176 177 </div>
177 178 {{/each}}
178 179 </script>
... ...
sass/_proposal_detail.scss
  Diff comments   View file @b60b873
... ... @@ -379,8 +379,8 @@
379 379 .experience-proposal-container{
380 380 float: left;
381 381 width: 50%;
382   - height: $container-height;
383   - min-height: $container-height;
  382 + // height: $container-height;
  383 + // min-height: $container-height;
384 384 position: relative;
385 385 text-align: center;
386 386 .experience-proposal{
... ... @@ -413,8 +413,8 @@
413 413 .talk-proposal-container{
414 414 width: 50%;
415 415 float: left;
416   - height: $container-height;
417   - min-height: $container-height;
  416 + // height: $container-height;
  417 + // min-height: $container-height;
418 418 position: relative;
419 419 text-align: center;
420 420 .talk-proposal {
... ...
sass/style.scss
  Diff comments   View file @b60b873
... ... @@ -40,7 +40,7 @@ h1 {
40 40  
41 41 #proposal-result {
42 42 width: 90%;
43   - margin: 0 auto;
  43 + margin: 0 auto 40px auto;
44 44 }
45 45  
46 46 #content {
... ...