From 5e06a51c4d769e5fc25150f7805cec6859b2625c Mon Sep 17 00:00:00 2001
From: Laurent Heirendt <laurent.heirendt@uni.lu>
Date: Mon, 16 Jan 2017 10:29:55 +0100
Subject: [PATCH] Added content for branches slides

---
 css/style.css                |  2 +-
 slides/branches.md           | 11 ++++++-----
 slides/essential_commands.md |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/css/style.css b/css/style.css
index 05ae57b0..778eee3a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -21,7 +21,7 @@
   margin: 10px 0px;
   background: rgba(255, 255, 255, 0.12);
   border: 0px solid #000;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 0px rgba(0, 0, 0, 0.15);
   -webkit-transition: all .2s linear;
   -moz-transition: all .2s linear;
   -ms-transition: all .2s linear;
diff --git a/slides/branches.md b/slides/branches.md
index 69f185de..4cf120ff 100644
--- a/slides/branches.md
+++ b/slides/branches.md
@@ -3,7 +3,7 @@
 Branch-off within the same repository in order to stay safe!
 
 The master branch:
-<img src="img/branch-0-master.png" class="as-is" />
+<img src="img/branch-master.png" class="branch-master" />
 
 
 ## One branch per feature
@@ -14,7 +14,7 @@ $ git checkout -b matrix_vect_mult_myName
 ```
 The `-b` flag creates the branch.
 
-<img src="img/branch-1-checkout-b.png" class="as-is" />
+<img src="img/branch-create.png" class="branch-create" />
 
 
 ## Switch between branches
@@ -40,22 +40,23 @@ You can switch back to master with
 $ git checkout master
 ```
 
-<div class="fragment">
+
 <br>
 You can use the 5 essential commands as before.
 
 Only difference: you are on your own branch.
 
+<img src="img/branch-commit.png" class="branch-commit" />
+
 
 ## Merge a branch
 
 If you want your feature on the `develop` or `master` branches, merge!
 
-<br>
 **submit a MR or a PR** via the Github/Gitlab interface.
 
+<img src="img/branch-merge.png" class="branch-merge" />
 <div class="fragment">
-<br>
 **ADVANCED**: You can see the differences between branches
 ```sh
 $ git diff master..matrix_vect_mult_myName
diff --git a/slides/essential_commands.md b/slides/essential_commands.md
index f1e31177..2b29de7d 100644
--- a/slides/essential_commands.md
+++ b/slides/essential_commands.md
@@ -95,7 +95,7 @@ $ git pull
 ```
 
 
-## Push your file to the folder
+## Push your file to the repository
 
 ```sh
 $ git push
-- 
GitLab