added in the copy for pull/push flows

This commit is contained in:
Justine Arreche 2015-03-30 11:22:43 +02:00
parent 86c6d84941
commit d29193f396
2 changed files with 16 additions and 0 deletions

View File

@ -144,6 +144,12 @@
.branch-bf
.bf
display: inline-block
max-width: 120px
p
font-size: 1em
line-height: 1.5em
color: #5f6062
.divider-line
width: 60px

View File

@ -104,52 +104,62 @@
<div class="branch-bf">
<div class="bf">
<img src="../images/landing-page/push-icon-1.svg">
<p>You push your code to Github</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/push-icon-2.svg">
<p>Github triggers Travis CI to build</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/push-icon-3.svg">
<p>Hooray!<br>Your build passes!</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/push-icon-4.svg">
<p>Travis CI deploys to Heroku</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/push-icon-5.svg">
<p>Travis CI tells the team all is good</p>
</div>
</div>
<h2>Pull Request build flow</h2>
<div class="branch-bf">
<div class="bf">
<img src="../images/landing-page/pull-icon-1.svg">
<p>A pull request is created</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/pull-icon-2.svg">
<p>Github tells Travis CI the build is mergeable</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/push-icon-3.svg">
<p>Hooray!<br>Your build passes!</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/pull-icon-4.svg">
<p>Travis CI updates the PR that it passed</p>
</div>
<div class="divider-line">
</div>
<div class="bf">
<img src="../images/landing-page/pull-icon-5.svg">
<p>You merge in the PR goodness</p>
</div>
</div>
</div>