From 2250b9b47359b766072b46bc95a00903c1d852a3 Mon Sep 17 00:00:00 2001 From: blinry Date: Fri, 19 Feb 2021 11:40:36 +0100 Subject: [PATCH] Polish some levels in the first chapters, and the branch-delete icon --- cards/branch-delete.svg | 48 ++++++++------------------------- levels/branches/checkout-commit | 4 +-- levels/intro/cli | 4 +-- levels/intro/commit | 4 +-- levels/intro/remote | 2 ++ resources/cards.json | 4 +-- 6 files changed, 18 insertions(+), 48 deletions(-) diff --git a/cards/branch-delete.svg b/cards/branch-delete.svg index 5a98c82..36b1fe4 100644 --- a/cards/branch-delete.svg +++ b/cards/branch-delete.svg @@ -7,12 +7,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="74.204613mm" - height="68.206726mm" - viewBox="0 0 74.204614 68.206723" + width="48.190598mm" + height="46.673248mm" + viewBox="0 0 48.190598 46.673246" version="1.1" id="svg8" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)" sodipodi:docname="branch-delete.svg"> @@ -180,16 +180,16 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="851.91245" - inkscape:cy="-49.019742" + inkscape:cx="199.21333" + inkscape:cy="69.365333" inkscape:document-units="mm" inkscape:current-layer="layer1" inkscape:document-rotation="0" showgrid="false" - inkscape:window-width="3840" - inkscape:window-height="2111" - inkscape:window-x="0" - inkscape:window-y="0" + inkscape:window-width="1680" + inkscape:window-height="985" + inkscape:window-x="6400" + inkscape:window-y="1140" inkscape:window-maximized="1" inkscape:snap-global="false" /> - + transform="translate(-148.73814,-89.246965)"> - - - - - diff --git a/levels/branches/checkout-commit b/levels/branches/checkout-commit index 28fcf3c..87061d8 100644 --- a/levels/branches/checkout-commit +++ b/levels/branches/checkout-commit @@ -5,9 +5,7 @@ cards = checkout commit-auto The yellow boxes are frozen points in time, we call them "commits"! You can travel between them using the "checkout" card! (Try it!) -The grey panel below shows your current environment - click on an object to inspect or modify it! - -Can you find out what happened here? Then, while on the latest commit, edit the files to fix the problem, and make a new commit! +Can you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit! [cli] diff --git a/levels/intro/cli b/levels/intro/cli index de2380b..1ee655b 100644 --- a/levels/intro/cli +++ b/levels/intro/cli @@ -22,8 +22,6 @@ test -d .git [congrats] -Cool! When you don't use the cards in a level, you'll get a golden sparkling "command line badge"! See it in the top left? +Cool! Instead of using the playing cards, you can also do everything via the command line! The command line is pretty powerful! Often, you can use it to solve tasks faster compared to using a graphical interface. - -It's also totally optional in this game. But if you want to learn how to use Git from the command line, we invite you to this challenge! :) diff --git a/levels/intro/commit b/levels/intro/commit index 8f0dc56..333ea6e 100644 --- a/levels/intro/commit +++ b/levels/intro/commit @@ -3,9 +3,7 @@ cards = commit-auto [description] -You can use your time machine to make snapshots of objects around you! - -Here, let's practice this! +You can use your time machine to make snapshots of objects around you! Here, let's practice this! (Your teacher pours some water into a glass.) diff --git a/levels/intro/remote b/levels/intro/remote index be5e376..c19b49a 100644 --- a/levels/intro/remote +++ b/levels/intro/remote @@ -22,6 +22,8 @@ git add . git commit -m "Initial version" git push -u teacher main +git update-ref -d refs/remotes/teacher/main + [setup teacher] git reset --hard main diff --git a/resources/cards.json b/resources/cards.json index 84d846e..a0f6e4a 100644 --- a/resources/cards.json +++ b/resources/cards.json @@ -41,8 +41,8 @@ }, { "id": "commit-auto", - "command": "git add .; git commit -m \"New commit\"", - "description": "Make a new commit containing your current environment!" + "command": "git add .; git commit", + "description": "Make a new commit containing your current environment! Type in a description of what changed!" }, { "id": "merge",