diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02769824cd34d47ce7b074904fe86d0f6930d149..21d6f9c09fbd7104a7265796ed8ffb7d8312110d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: digitallyseamless/nodejs-bower-grunt pages: stage: deploy only: + - develop - master script: - npm install --global npm@latest @@ -11,6 +12,7 @@ pages: - npm install -g generator-reveal - npm install -g bower - npm install + - rm -rf public - grunt dist artifacts: diff --git a/img b/img new file mode 120000 index 0000000000000000000000000000000000000000..f2a30196cbad4b787c9b6721910c0a9716813afa --- /dev/null +++ b/img @@ -0,0 +1 @@ +slides/img \ No newline at end of file diff --git a/img/Git-Logo-Black.png b/slides/img/Git-Logo-Black.png similarity index 100% rename from img/Git-Logo-Black.png rename to slides/img/Git-Logo-Black.png diff --git a/img/branch-commit.png b/slides/img/branch-commit.png similarity index 100% rename from img/branch-commit.png rename to slides/img/branch-commit.png diff --git a/img/branch-create.png b/slides/img/branch-create.png similarity index 100% rename from img/branch-create.png rename to slides/img/branch-create.png diff --git a/img/branch-i-state.graffle b/slides/img/branch-i-state.graffle similarity index 100% rename from img/branch-i-state.graffle rename to slides/img/branch-i-state.graffle diff --git a/img/branch-master.png b/slides/img/branch-master.png similarity index 100% rename from img/branch-master.png rename to slides/img/branch-master.png diff --git a/img/branch-merge.png b/slides/img/branch-merge.png similarity index 100% rename from img/branch-merge.png rename to slides/img/branch-merge.png diff --git a/img/github_app.png b/slides/img/github_app.png similarity index 100% rename from img/github_app.png rename to slides/img/github_app.png diff --git a/img/gray-linen-background-texture_58348.jpg b/slides/img/gray-linen-background-texture_58348.jpg similarity index 100% rename from img/gray-linen-background-texture_58348.jpg rename to slides/img/gray-linen-background-texture_58348.jpg diff --git a/img/linus.jpg b/slides/img/linus.jpg similarity index 100% rename from img/linus.jpg rename to slides/img/linus.jpg diff --git a/img/logoLCSB.png b/slides/img/logoLCSB.png similarity index 100% rename from img/logoLCSB.png rename to slides/img/logoLCSB.png diff --git a/img/remote-0-master.png b/slides/img/remote-0-master.png similarity index 100% rename from img/remote-0-master.png rename to slides/img/remote-0-master.png diff --git a/img/remote-1-remote.png b/slides/img/remote-1-remote.png similarity index 100% rename from img/remote-1-remote.png rename to slides/img/remote-1-remote.png diff --git a/img/remote-2-push.png b/slides/img/remote-2-push.png similarity index 100% rename from img/remote-2-push.png rename to slides/img/remote-2-push.png diff --git a/img/remote-i-state.graffle b/slides/img/remote-i-state.graffle similarity index 100% rename from img/remote-i-state.graffle rename to slides/img/remote-i-state.graffle diff --git a/img/sbgBackgroundWhite.jpg b/slides/img/sbgBackgroundWhite.jpg similarity index 100% rename from img/sbgBackgroundWhite.jpg rename to slides/img/sbgBackgroundWhite.jpg diff --git a/img/whiteBG.jpg b/slides/img/whiteBG.jpg similarity index 100% rename from img/whiteBG.jpg rename to slides/img/whiteBG.jpg diff --git a/slides/list.json b/slides/list.json index 1e09f925c05a840f51a47256af93b944d4e84a5c..f4e8a89bfc1eeb1f98ebd2f99cb55c80e60bb842 100644 --- a/slides/list.json +++ b/slides/list.json @@ -2,61 +2,61 @@ { "filename": "index.md", "attr": { - "data-background": "../img/sbgBackgroundWhite.jpg" + "data-background": "img/sbgBackgroundWhite.jpg" } }, { "filename": "overview.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "the_terminal.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "what_is_git.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "installation.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "essential_commands.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "github_gitlab.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "branches.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "best_practices.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } }, { "filename": "thanks.md", "attr": { - "data-background": "../img/whiteBG.jpg" + "data-background": "img/whiteBG.jpg" } } ]