Skip to content

Commit

Permalink
Merge pull request #27 from gogoleff/fix-hackatone-2
Browse files Browse the repository at this point in the history
Hackflow: fix schemes
  • Loading branch information
gogoleff committed Apr 17, 2016
2 parents f9d9668 + 56c9fa6 commit 70bd0da
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
Binary file added hackatone-2/img/flow-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hackatone-2/img/flow-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hackatone-2/img/flow-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion hackatone-2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ <h4 class="blue">1. Подготовка к разработке</h4>
</section>

<section>
<img src="img/flow.png" width=800>
<h4 class="blue">1. Подготовка к разработке</h4>
<img src="img/flow-1.png" width=800>
</section>

<section>
Expand Down Expand Up @@ -165,6 +166,11 @@ <h4 class="blue">4. Создание пулла c решением</h4>

</section>

<section>
<h4 class="blue">2-4. Работа над задачей</h4>
<img src="img/flow-2.png" width=800>
</section>

<section>
<h4 class="blue">5. Ревью и обновление пулла</h4>
<pre class="flat fragment">
Expand All @@ -181,6 +187,11 @@ <h4 class="blue">5. Ревью и обновление пулла</h4>
</pre>
</section>

<section>
<h4 class="blue">5. Обновление пулла</h4>
<img src="img/flow-3.png" width=800>
</section>

<section>
<h4 class="blue">6. Слияние пулла</h4>
<pre class="flat fragment">
Expand All @@ -195,6 +206,11 @@ <h4 class="blue">6. Слияние пулла</h4>
</pre>
</section>

<section>
<h4 class="blue">Общая схема</h4>
<img src="img/flow.png" width=800>
</section>

<section data-background="img/go.png" data-background-size="70%" data-background-color="black"></section>

</div></div>
Expand Down

0 comments on commit 70bd0da

Please sign in to comment.