Merge branch 'landing-page' of github.com:travis-ci/travis-web into landing-page

This commit is contained in:
Justine Arreche 2015-04-07 16:56:59 +02:00
commit 84d187eb83
5 changed files with 13 additions and 6 deletions

View File

@ -25,7 +25,7 @@ footer
height: auto
@media (min-width: 640px)
.wrapper
padding-bottom: 204px
padding-bottom: 244px //footer height plus some extra padding
footer
margin-top: -204px
@ -86,3 +86,6 @@ footer a:active
.status-circle.major
background: #e74c3c
.wrapper:not(.centered) ~ footer
display: none

View File

@ -75,7 +75,7 @@ $sb-font-size: 14px
.icon--plus:after
color: $teal1
&:after
bottom: 0
bottom: -3px
@media (min-width: #{lower-bound($large-range)})
ul

View File

@ -25,7 +25,7 @@
content: ""
position: absolute
left: 0
bottom: -0.25em
bottom: -4px
width: 100%
height: 2px
background-color: $teal2

View File

@ -17,6 +17,6 @@
</aside>
</div>
{{!-- <footer>
<footer>
{{render "footer"}}
</footer> --}}
</footer>

View File

@ -4,7 +4,7 @@
</div>
</header>
<div class="centered">
<div class="wrapper centered">
{{render "flash"}}
<div id="main" class="main" role="main">
{{yield}}
@ -12,3 +12,7 @@
{{outlet "left"}}
</div>
</div>
<footer>
{{render "footer"}}
</footer>