[squash] adjust mermaid size on handouts

NETWAYS · Jan 11, 2023 · 09bf6f5 · 09bf6f5
1 parent 817fa0b
commit 09bf6f5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/day1/01_Introduction/03_Basics.md b/day1/01_Introduction/03_Basics.md
@@ -31,7 +31,7 @@
   * Set of snapshots of a mini-filesystem
   * No change - link to the previous identical stored file
 
-<center><img src="../../_images/mermaid/deltas.mmd.png" alt="Detla Changes"/></center>
+<center><img src="../../_images/mermaid/deltas.mmd.png" width="70%" alt="Detla Changes"/></center>
 
 
 !SLIDE smbullets
@@ -62,7 +62,7 @@ Example:
 
 ~~~ENDSECTION~~~
 
-!SLIDE smbullets
+!SLIDE smbullets noprint
 # The three states
 
 * Working directory ("modified")
@@ -71,6 +71,14 @@ Example:
 
 <center><img src="../../_images/mermaid/git-stages.mmd.png" alt="Git Stages"/></center>
 
+!SLIDE smbullets printonly
+# The three states
+
+* Working directory ("modified")
+* Staging area ("staged")
+* Git directory ("committed")
+
+<center><img src="../../_images/mermaid/git-stages.mmd.png" width="75%" alt="Git Stages"/></center>
 
 ~~~SECTION:notes~~~
 

diff --git a/day2/01_Workflows/02_Centralized.md b/day2/01_Workflows/02_Centralized.md
@@ -45,10 +45,10 @@ Remote Repository
 * Adds all local commits that are not in the central main branch
 
 Local Repository
-<center><img src="../../_images/mermaid/workflow-local.mmd.png"></center>
+<center><img src="../../_images/mermaid/workflow-local.mmd.png" width="50%"></center>
 
 Remote Repository
-<center><img src="../../_images/mermaid/workflow-remote.mmd.png"></center>
+<center><img src="../../_images/mermaid/workflow-remote.mmd.png" width="50%"></center>
 
 ~~~SECTION:handouts~~~
 
@@ -71,7 +71,7 @@ Remote Repository
 * Central repository's commit history is important
 * If local commit history diverges, pushing changes is denied
 
-<center><img src="../../_images/mermaid/workflow-diverge.mmd.png" alt="Diverged Remote"/></center>
+<center><img src="../../_images/mermaid/workflow-diverge.mmd.png" alt="Diverged Remote" width="75%" /></center>
 
 
 ~~~SECTION:handouts~~~
@@ -180,9 +180,9 @@ in a non-fast forward fashion is not allowed.
 * Fetch the remote history
 * Rebase local changes on top of it for a linear history
 
-<center><img src="../../_images/mermaid/workflow-before-rebase.mmd.png" alt="Before Rebase"/></center>
+<center><img src="../../_images/mermaid/workflow-before-rebase.mmd.png" alt="Before Rebase" width="75%" /></center>
 
-<center><img src="../../_images/mermaid/workflow-after-rebase.mmd.png" alt="After Rebase"/></center>
+<center><img src="../../_images/mermaid/workflow-after-rebase.mmd.png" alt="After Rebase"width="75%" /></center>
 
 ~~~SECTION:handouts~~~
 
@@ -282,6 +282,3 @@ Resolve the conflicts, add the file and continue the rebase.
 ### Push the changes to the remote repository
 
     $ git push origin main
-
-
-
diff --git a/day2/01_Workflows/03_Feature_Branch.md b/day2/01_Workflows/03_Feature_Branch.md
@@ -16,7 +16,7 @@
 * Main branch does not contain broken code
 * Feature branches can be rebased against stable main branch on demand
 
-<center><img src="../../_images/mermaid/workflow-branches.mmd.png" alt="Feature Branch Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-branches.mmd.png" alt="Feature Branch Workflow" width="75%" /></center>
 
 ~~~SECTION:handouts~~~
 

diff --git a/day2/01_Workflows/04_Gitflow.md b/day2/01_Workflows/04_Gitflow.md
@@ -33,7 +33,7 @@
 * Main branch is always `stable` and in production
 * Develop branch for feature integration
 
-<center><img src="../../_images/mermaid/workflow-historical-branches.mmd.png" alt="Gitflow Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-historical-branches.mmd.png" alt="Gitflow Workflow" width="75%" /></center>
 
 
 ~~~SECTION:handouts~~~
@@ -59,7 +59,7 @@
 * Feature branches use `develop` as their parent branch
 * Once completed, merged back to `develop`
 
-<center><img src="../../_images/mermaid/workflow-feature-branches.mmd.png" alt="Gitflow Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-feature-branches.mmd.png" alt="Gitflow Workflow" width="85%" /></center>
 
 ~~~SECTION:handouts~~~
 
@@ -82,7 +82,7 @@
 * Enough features in `develop`: `release` branch based on `develop`
 * Ready to ship: merged to `main` and tagged with version
 
-<center><img src="../../_images/mermaid/workflow-release-branches.mmd.png" alt="Gitflow Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-release-branches.mmd.png" alt="Gitflow Workflow" width="85%" /></center>
 
 ~~~SECTION:handouts~~~
 
@@ -104,7 +104,7 @@
 * Fixes based on `main`
 * Merged to `main`, tagged and merged to `develop`
 
-<center><img src="../../_images/mermaid/workflow-maintenance-branch.mmd.png" style="width:800px" alt="Gitflow Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-maintenance-branch.mmd.png" alt="Gitflow Workflow" width="85%" /></center>
 
 ~~~SECTION:handouts~~~
 

diff --git a/day2/01_Workflows/06_Github_Flow.md b/day2/01_Workflows/06_Github_Flow.md
@@ -16,7 +16,7 @@
 * Create a `Pull Request` for original repo, CI runs automated tests
 * Developers/Maintainers review and merge PR, CI triggers deployment task
 
-<center><img src="../../_images/mermaid/workflow-github-pr.mmd.png" alt="GitHub Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-github-pr.mmd.png" alt="GitHub Workflow" width="75%" /></center>
 
 ~~~SECTION:handouts~~~
 

diff --git a/day2/01_Workflows/07_Gitlab_Workflow.md b/day2/01_Workflows/07_Gitlab_Workflow.md
@@ -16,7 +16,7 @@
 * Review and inline code comments
 * Project maintainer merges requests and manages issues/milestones/releases
 
-<center><img src="../../_images/mermaid/workflow-gitlab-mr.mmd.png" alt="GitLab Workflow"/></center>
+<center><img src="../../_images/mermaid/workflow-gitlab-mr.mmd.png" alt="GitLab Workflow" width="75%" /></center>
 
 ~~~SECTION:handouts~~~