Auto-merged master into ps-title-pages on deployment.

This commit is contained in:
Piotr Sarnacki 2015-02-16 16:47:21 +01:00
commit 0eed77401e
3 changed files with 13 additions and 13 deletions

View File

@ -1,6 +1,7 @@
.centered .row
max-width: 1024px
.centered
.row
max-width: 1024px
.main,
.profile-view
@ -50,7 +51,6 @@
// layout magic http://lea.verou.me/2011/01/styling-children-based-on-their-number-with-css3/
.wrapper-main
overflow: hidden
height: 100%
& > div:first-child:nth-last-child(2)
width: grid-calc(20, 24)
float: left

View File

@ -20,7 +20,7 @@ footer
.wrapper
padding-bottom: 334px
min-height: 100%
min-height: 100vh
height: auto
@media (min-width: 640px)
.wrapper

View File

@ -52,20 +52,20 @@
<div class="small-6 medium-2 large-2 columns">
<h3>Help</h3>
<ul>
<li><a href="#">Documentation</a></li>
<li><a href="#">Blog</a></li>
<li><a href="#">Email</a></li>
<li><a href="#">Live Chat</a></li>
<li><a href="#">Twitter</a></li>
<li><a href="http://docs.travis-ci.com/">Documentation</a></li>
<li><a href="http://blog.travis-ci.com/">Blog</a></li>
<li><a href="mailto:support@travis-ci.com">Email</a></li>
<li><a href="https://travisci.campfirenow.com">Live Chat</a></li>
<li><a href="https://twitter.com/travisci">Twitter</a></li>
</ul>
</div>
<div class="small-6 medium-2 large-2 columns">
<h3>Legal</h3>
<ul>
<li><a href="#">Imprint</a></li>
<li><a href="#">Terms of Service</a></li>
<li><a href="#">Privacy Policy</a></li>
<li><a href="http://docs.travis-ci.com/imprint.html">Imprint</a></li>
<li><a href="https://billing.travis-ci.com/pages/terms">Terms of Service</a></li>
<li><a href="https://billing.travis-ci.com/pages/security">Security Statement</a></li>
</ul>
</div>
@ -73,7 +73,7 @@
<h3>Travis CI Status</h3>
<ul>
<li><div class="status-circle">Status:</div>
<a href="#">Travis CI Status</a>
<a href="http://www.traviscistatus.com/">Travis CI Status</a>
</li>
</ul>
</div>