Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-20 20:33:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse source
This commit is contained in:
bleeptrack 2021-01-14 11:44:50 +01:00
commit 8de8494677
18 changed files with 733 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
cards/add.svg Normal file
View file

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
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="89.99337mm"
height="57.753811mm"
viewBox="0 0 89.993363 57.753809"
version="1.1"
id="svg8"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="add.svg">
<defs
id="defs2">
<inkscape:path-effect
effect="spiro"
id="path-effect1251"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect895"
is_visible="true"
lpeversion="1" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="128.89425"
inkscape:cy="-219.03462"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="2125"
inkscape:window-x="5120"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="false" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-68.29495,-76.452729)">
<g
id="g836"
transform="matrix(1.1299927,0,0,1.1299927,54.68078,-41.809841)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path867"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="rect833"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g931"
transform="matrix(0.98946746,0.14475547,0.14475547,-0.98946746,8.2408987,168.68615)">
<path
style="fill:none;stroke:#ff2a2a;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
d="M 85.855531,69.477913 94.69821,75.46461"
id="path893"
inkscape:path-effect="#path-effect895"
inkscape:original-d="m 85.855531,69.477913 c 6.783573,6.868065 2.342796,-0.0391 8.842679,5.986697"
sodipodi:nodetypes="cc" />
<path
style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:6.00001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
id="path1249"
inkscape:path-effect="#path-effect1251"
inkscape:original-d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
sodipodi:nodetypes="cccc" />
</g>
<g
id="g955"
transform="matrix(1.1299927,0,0,1.1299927,116.90995,-65.1611)"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path951"
sodipodi:nodetypes="cccc" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="path953"
sodipodi:nodetypes="sssssscccs" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

34
cards/add.svg.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/add.svg-6661eafc7f78160aaf9088910aa4975e.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://cards/add.svg"
dest_files=[ "res://.import/add.svg-6661eafc7f78160aaf9088910aa4975e.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

118
cards/checkout-file.svg Normal file
View file

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
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="89.99337mm"
height="57.753811mm"
viewBox="0 0 89.993363 57.753809"
version="1.1"
id="svg8"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="checkout-file.svg">
<defs
id="defs2">
<inkscape:path-effect
effect="spiro"
id="path-effect1251"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect895"
is_visible="true"
lpeversion="1" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="531.21808"
inkscape:cy="-229.75035"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="2125"
inkscape:window-x="5120"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="false" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-68.29495,-76.452729)">
<g
id="g836"
transform="matrix(1.1299927,0,0,1.1299927,54.68078,-41.809841)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path867"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="rect833"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g931"
transform="matrix(-0.98894096,-0.14830972,-0.14830972,0.98894096,219.0232,47.369024)">
<path
style="fill:none;stroke:#ff2a2a;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
d="M 85.855531,69.477913 94.69821,75.46461"
id="path893"
inkscape:path-effect="#path-effect895"
inkscape:original-d="m 85.855531,69.477913 c 6.783573,6.868065 2.342796,-0.0391 8.842679,5.986697"
sodipodi:nodetypes="cc" />
<path
style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:6.00001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
id="path1249"
inkscape:path-effect="#path-effect1251"
inkscape:original-d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
sodipodi:nodetypes="cccc" />
</g>
<g
id="g955"
transform="matrix(1.1299927,0,0,1.1299927,116.90995,-65.1611)"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path951"
sodipodi:nodetypes="cccc" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="path953"
sodipodi:nodetypes="sssssscccs" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

34
cards/checkout-file.svg.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://cards/checkout-file.svg"
dest_files=[ "res://.import/checkout-file.svg-33b29020ffdca452c2ad5907a0f12ad0.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

216
cards/commit.svg Normal file
View file

@ -0,0 +1,216 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
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="151.59703mm"
height="72.777908mm"
viewBox="0 0 151.59702 72.777906"
version="1.1"
id="svg8"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="commit.svg">
<defs
id="defs2">
<inkscape:path-effect
effect="spiro"
id="path-effect1251"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect895"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect863"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect859"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect855"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect851"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect847"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect843"
is_visible="true"
lpeversion="1" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="364.60646"
inkscape:cy="-158.81516"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="2125"
inkscape:window-x="5120"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="false" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-21.599203,-61.16049)">
<g
id="g1002"
transform="matrix(1.1299927,0,0,1.1299927,42.168532,-42.077982)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path998"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="path1000"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g1008"
transform="matrix(1.1299927,0,0,1.1299927,7.9850329,-49.47957)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path1004"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="path1006"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g836"
transform="matrix(1.1299927,0,0,1.1299927,31.89701,-80.453339)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path867"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="rect833"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g931"
transform="matrix(0.21843815,0.97585079,0.97585079,-0.21843815,22.394784,3.1103997)">
<path
style="fill:none;stroke:#ff2a2a;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
d="m 84.066799,48.08879 c -1.887423,5.94073 -1.271294,12.633802 1.668965,18.13012 2.051068,3.834126 5.193975,7.076363 8.962446,9.2457"
id="path893"
inkscape:path-effect="#path-effect895"
inkscape:original-d="m 84.066799,48.08879 c 0.430595,6.10664 1.112908,12.08702 1.668965,18.13012 0.556057,6.04311 5.975229,6.16407 8.962446,9.2457" />
<path
style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:6.00001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
id="path1249"
inkscape:path-effect="#path-effect1251"
inkscape:original-d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
sodipodi:nodetypes="cccc" />
</g>
<g
inkscape:label="Layer 1"
id="layer1-1"
transform="translate(60.640195,15.561828)">
<rect
style="fill:#c2bf26;fill-opacity:1;fill-rule:evenodd;stroke-width:0.0999996;stroke-linecap:round;stroke-linejoin:round"
id="rect831"
width="24.586214"
height="24.586214"
x="64.29911"
y="84.016113"
ry="3.3460476" />
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="M 97.691152,83.721558 106.7887,78.937913"
id="path845"
inkscape:path-effect="#path-effect847"
inkscape:original-d="m 97.691152,83.721558 c 3.032778,-1.594284 6.065298,-3.188832 9.097548,-4.783645" />
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="m 101.23386,95.348882 10.24732,-0.800661"
id="path849"
inkscape:path-effect="#path-effect851"
inkscape:original-d="m 101.23386,95.348882 c 3.41591,-0.266542 6.83168,-0.533426 10.24732,-0.800661" />
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="m 98.797203,107.41531 9.611927,3.64134"
id="path841"
inkscape:path-effect="#path-effect843"
inkscape:original-d="m 98.797203,107.41531 c 3.203947,1.21416 6.407927,2.42793 9.611927,3.64134" />
<g
id="g868"
transform="rotate(180,48.701191,94.938065)">
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="m 49.494361,77.302845 -9.097548,4.783644"
id="path853"
inkscape:path-effect="#path-effect855"
inkscape:original-d="m 49.494361,77.302845 c -3.032779,1.594284 -6.065298,3.188832 -9.097548,4.783644" />
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="m 54.186841,92.913154 -10.24732,0.800661"
id="path857"
inkscape:path-effect="#path-effect859"
inkscape:original-d="m 54.186841,92.913154 c -3.415909,0.266542 -6.831678,0.533426 -10.24732,0.800661" />
<path
style="fill:none;stroke:#c2bf26;stroke-width:2;stroke-linecap:square;stroke-opacity:1"
d="m 51.114787,109.42158 -9.61192,-3.64134"
id="path861"
inkscape:path-effect="#path-effect863"
inkscape:original-d="m 51.114787,109.42158 c -3.20394,-1.21416 -6.40792,-2.42793 -9.61192,-3.64134" />
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

34
cards/commit.svg.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://cards/commit.svg"
dest_files=[ "res://.import/commit.svg-81b72e6d51b3c0f35ba9ffe75a779e27.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

118
cards/reset-file.svg Normal file
View file

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
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="89.99337mm"
height="57.753811mm"
viewBox="0 0 89.993363 57.753809"
version="1.1"
id="svg8"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="reset-file.svg">
<defs
id="defs2">
<inkscape:path-effect
effect="spiro"
id="path-effect1251"
is_visible="true"
lpeversion="1" />
<inkscape:path-effect
effect="spiro"
id="path-effect895"
is_visible="true"
lpeversion="1" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="514.77252"
inkscape:cy="-219.03462"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="2125"
inkscape:window-x="5120"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="false" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-68.29495,-76.452729)">
<g
id="g836"
transform="matrix(1.1299927,0,0,1.1299927,54.68078,-41.809841)"
style="fill:#666666;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path867"
sodipodi:nodetypes="cccc" />
<path
style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="rect833"
sodipodi:nodetypes="sssssscccs" />
</g>
<g
id="g931"
transform="matrix(-0.99405285,-0.1088987,-0.1088987,0.99405285,216.52424,43.446165)">
<path
style="fill:none;stroke:#ff2a2a;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
d="M 85.855531,69.477913 94.69821,75.46461"
id="path893"
inkscape:path-effect="#path-effect895"
inkscape:original-d="m 85.855531,69.477913 c 6.783573,6.868065 2.342796,-0.0391 8.842679,5.986697"
sodipodi:nodetypes="cc" />
<path
style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:6.00001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
id="path1249"
inkscape:path-effect="#path-effect1251"
inkscape:original-d="M 90.733797,83.39748 99.892615,68.8484 109.08327,84.53626 Z"
sodipodi:nodetypes="cccc" />
</g>
<g
id="g955"
transform="matrix(1.1299927,0,0,1.1299927,116.90995,-65.1611)"
style="fill:#7979ff;fill-opacity:1;stroke-width:0.884961">
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:1.54646;stroke-miterlimit:10"
d="m 27.687619,125.4926 v 8.76189 h 8.760685 z"
id="path951"
sodipodi:nodetypes="cccc" />
<path
style="fill:#7979ff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:10"
d="m -130.84766,-71.34375 c -4.77953,0 -8.62695,3.847415 -8.62695,8.626953 V 50.054688 c 0,4.779538 3.84742,8.626953 8.62695,8.626953 h 87.681644 c 4.779539,0 8.626954,-3.847415 8.626954,-8.626953 v -76.6875 H -79.25 V -71.34375 Z"
transform="matrix(0.23414606,0,0,0.23414606,44.705446,142.02764)"
id="path953"
sodipodi:nodetypes="sssssscccs" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

34
cards/reset-file.svg.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://cards/reset-file.svg"
dest_files=[ "res://.import/reset-file.svg-15bbadedca7014f817d5e2a521d1d66b.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

2
levels/index/checkout
View file

@ -1,5 +1,5 @@
title = Checking out files from the index
cards = add reset checkout-file commit
cards = add reset-file checkout-file commit
[description]

2
levels/index/reset
View file

@ -1,5 +1,5 @@
title = Resetting files in the index
cards = add reset commit
cards = add reset-file commit
[description]

2
levels/index/rm
View file

@ -1,5 +1,5 @@
title = Delete a file in the next commit
cards = add reset checkout-file rm file-delete commit
cards = add reset-file checkout-file rm file-delete commit
[description]

1
levels/index/sequence
View file

@ -4,4 +4,3 @@ add
reset
checkout
rm
mv

1
levels/remotes/sequence
View file

@ -1,3 +1,2 @@
friend
problems
fetch

0
levels/remotes/fetch → levels/unused/fetch
View file

2
levels/index/mv → levels/unused/index-mv
View file

@ -1,5 +1,5 @@
title = Rename a file in the next commit
cards = add reset checkout-file mv commit
cards = add reset-file checkout-file mv commit
[description]

19
resources/cards.json
View file

@ -62,17 +62,17 @@
{
"id": "pull",
"command": "git pull",
"description": "Get timelines from a friend."
"description": "Get a friend's version of the current timeline, and try to merge it into yours."
},
{
"id": "fetch",
"command": "git fetch [remote]",
"description": "Get timelines from a friend."
"description": "Get a friend's version of the current timeline."
},
{
"id": "push",
"command": "git push",
"description": "Give timelines to a friend."
"description": "Give the current timeline to a friend."
},
{
"id": "rebase-interactive",
@ -91,8 +91,13 @@
},
{
"id": "reset",
"command": "git reset [commit, file]",
"description": "Jump to the commit, and update the index. Keep the current environment.\n\nAlternatively, reset changes in a file in the index."
"command": "git reset [commit]",
"description": "Jump to the commit, and update the index. Keep the current environment."
},
{
"id": "reset-file",
"command": "git reset [file]",
"description": "Reset the index version of a file to the version in the commit you're on."
},
{
"id": "cherry-pick",
@ -122,7 +127,7 @@
{
"id": "add",
"command": "git add [file]",
"description": "Put the current status of the file into the plan."
"description": "Update the index version of the file to its current real content."
},
{
"id": "rm",
@ -137,7 +142,7 @@
{
"id": "commit",
"command": "git commit",
"description": "Make a commit from the plan."
"description": "Make a commit from the current index."
},
{
"id": "show",

12
scenes/card.tscn
View file

@ -61,14 +61,14 @@ __meta__ = {
position = Vector2( 0, -145.336 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( -6.10352e-05, 0.00012207 )
position = Vector2( -6.10352e-05, -0.641296 )
shape = SubResource( 2 )
[node name="Label" type="Label" parent="."]
margin_left = -89.0
margin_top = -279.0
margin_right = 85.0
margin_bottom = -184.0
margin_bottom = -189.0
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Name"
@ -79,7 +79,7 @@ __meta__ = {
[node name="ColorRect2" type="Panel" parent="."]
margin_left = -97.0
margin_top = -166.0
margin_top = -101.0
margin_right = 94.0
margin_bottom = -10.0
mouse_filter = 2
@ -90,7 +90,7 @@ __meta__ = {
[node name="Description" type="Label" parent="."]
margin_left = -92.0
margin_top = -160.0
margin_top = -98.0
margin_right = 90.0
margin_bottom = -14.0
custom_fonts/font = ExtResource( 7 )
@ -134,9 +134,9 @@ volume_db = -6.848
[node name="Image" type="TextureRect" parent="."]
margin_left = -88.0
margin_top = -219.0
margin_top = -215.0
margin_right = 85.0
margin_bottom = -178.0
margin_bottom = -134.0
mouse_filter = 2
expand = true
stretch_mode = 6

5
scenes/node.gd
View file

@ -17,6 +17,7 @@ var arrow = preload("res://scenes/arrow.tscn")
func _ready():
content_set(content)
type_set(type)
id_set(id)
if not repository.simplified_view or (type != "tree" and type != "blob"):
$Pop.pitch_scale = rand_range(0.8, 1.2)
$Pop.play()
@ -57,6 +58,10 @@ func apply_forces():
func id_set(new_id):
id = new_id
$ID.text = id
if type == "ref":
$ID.text = $ID.text.replace("refs/heads/", "")
$ID.text = $ID.text.replace("refs/remotes/", "")
$ID.text = $ID.text.replace("refs/tags/", "")
func content_set(new_content):
content = new_content