mirror of
https://github.com/scratchfoundation/scratch-blocks.git
synced 2025-06-13 13:21:51 -04:00
Update vertical block icons to spec, fixes #526
This commit is contained in:
Tim Mickel
parent
9904ba6bc1
commit
ff9fadd62b
10 changed files with 53 additions and 24 deletions
|
|
@ -49,9 +49,9 @@ Blockly.Blocks['control_forever'] = {
|
|||
"args2": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/c_arrow.svg",
|
||||
"width": 16,
|
||||
"height": 16,
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/repeat.svg",
|
||||
"width": 24,
|
||||
"height": 24,
|
||||
"alt": "*",
|
||||
"flip_rtl": true
|
||||
}
|
||||
|
|
@ -90,9 +90,9 @@ Blockly.Blocks['control_repeat'] = {
|
|||
"args2": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/c_arrow.svg",
|
||||
"width": 16,
|
||||
"height": 16,
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/repeat.svg",
|
||||
"width": 24,
|
||||
"height": 24,
|
||||
"alt": "*",
|
||||
"flip_rtl": true
|
||||
}
|
||||
|
|
@ -283,9 +283,9 @@ Blockly.Blocks['control_repeat_until'] = {
|
|||
"args2": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/c_arrow.svg",
|
||||
"width": 16,
|
||||
"height": 16,
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/repeat.svg",
|
||||
"width": 24,
|
||||
"height": 24,
|
||||
"alt": "*",
|
||||
"flip_rtl": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ Blockly.Blocks['event_whenflagclicked'] = {
|
|||
"args0": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "icons/event_whenflagclicked.svg",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "green-flag.svg",
|
||||
"width": 24,
|
||||
"height": 24,
|
||||
"alt": "flag",
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ Blockly.Blocks['motion_turnright'] = {
|
|||
"args0": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/turnright_arrow.png",
|
||||
"width": 16,
|
||||
"height": 16
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "rotate-right.svg",
|
||||
"width": 24,
|
||||
"height": 24
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
|
|
@ -85,9 +85,9 @@ Blockly.Blocks['motion_turnleft'] = {
|
|||
"args0": [
|
||||
{
|
||||
"type": "field_image",
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "/turnleft_arrow.png",
|
||||
"width": 16,
|
||||
"height": 16
|
||||
"src": Blockly.mainWorkspace.options.pathToMedia + "rotate-left.svg",
|
||||
"width": 24,
|
||||
"height": 24
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<title>control_repeat</title>
|
||||
<g>
|
||||
<title>Layer 1</title>
|
||||
<path transform="rotate(90 20.325000762939453,19.92499923706055) " id="svg_1" fill="#cf8b17" d="m34.75,23l0,0.1l0,0.25a13.62,13.62 0 0 1 -1,4.69a14.19,14.19 0 0 1 -2.33,3.8a15.36,15.36 0 0 1 -3,2.57l-0.05,0a14.25,14.25 0 0 1 -3,1.4a8.62,8.62 0 0 1 -1.32,0.37a9.2,9.2 0 0 1 -1.22,0.21l-0.26,0c-0.28,0 -0.54,0.07 -0.78,0.08l-1,0a3,3 0 0 1 -0.28,-6s0.18,0 0.5,0l0.27,0l0.24,0a0.59,0.59 0 0 0 0.19,0a1.57,1.57 0 0 1 0.25,0l0.08,0a1.9,1.9 0 0 0 0.44,-0.12l0.06,0a3.28,3.28 0 0 0 0.61,-0.35l0.07,0a7.69,7.69 0 0 0 1.52,-0.86a8.7,8.7 0 0 0 1.46,-1.45a7.69,7.69 0 0 0 1.08,-2a6.34,6.34 0 0 0 0.37,-2.34l0,-0.29l0,-0.48l0,-0.14a0.62,0.62 0 0 1 0,-0.13l-0.13,-0.31a0.15,0.15 0 0 1 0,-0.07c0,-0.13 -0.06,-0.29 -0.12,-0.48l-0.07,-0.22a2.28,2.28 0 0 0 -0.1,-0.31l0,-0.08a6.75,6.75 0 0 0 -3,-3.47a6.24,6.24 0 0 0 -2,-0.7l-0.25,0a5.73,5.73 0 0 0 -0.67,-0.06l-1.31,0c-0.92,0 -1.78,0 -2.53,0l-1,0l0,3a2.06,2.06 0 0 1 -3.47,1.49l-7.1,-7.1a2.05,2.05 0 0 1 0,-2.91l7.1,-7.09a2,2 0 0 1 1.45,-0.62a2.06,2.06 0 0 1 2.06,2.06l0,3l1,0l2.52,0l0.79,0l0.87,0.16a13.63,13.63 0 0 1 2.14,0.4a14.36,14.36 0 0 1 10.24,9.5a8.29,8.29 0 0 1 0.3,1.07l0,0.15a11.73,11.73 0 0 1 0.27,1.28l0.07,0.64c0,0.16 0,0.28 0,0.39l0,1l0.04,-0.03z"/>
|
||||
<path transform="rotate(90 20.114887237548828,19.854661941528324) " id="svg_2" fill="#fff" d="m33.64989,22.77966l0,0.29a12.59,12.59 0 0 1 -1,4.34a13.32,13.32 0 0 1 -2.15,3.52a14.17,14.17 0 0 1 -2.78,2.4a12.88,12.88 0 0 1 -2.82,1.31a8.25,8.25 0 0 1 -1.23,0.35a7.56,7.56 0 0 1 -1.11,0.19c-0.34,0 -0.69,0.09 -0.92,0.1l-1,0a2,2 0 0 1 -0.2,-4l0.45,0l0.54,-0.05a5,5 0 0 0 0.53,-0.11a3.21,3.21 0 0 0 0.66,-0.17a5.22,5.22 0 0 0 0.8,-0.29a8.57,8.57 0 0 0 1.76,-1a10.06,10.06 0 0 0 1.72,-1.7a8.42,8.42 0 0 0 1.22,-2.26a7.44,7.44 0 0 0 0.43,-2.71l0,-0.29l0,-0.47a2.62,2.62 0 0 0 0,-0.43l-0.07,-0.29a3.92,3.92 0 0 0 -0.15,-0.62a5.11,5.11 0 0 0 -0.22,-0.66a7.72,7.72 0 0 0 -3.5,-4a7.4,7.4 0 0 0 -2.29,-0.81a7.21,7.21 0 0 0 -1.12,-0.11l-1.3,0c-1.84,0 -3.38,0 -4.47,0l0,4.05a1.05,1.05 0 0 1 -1.8,0.74l-7.13,-7.09a1,1 0 0 1 0,-1.49l7.08,-7.09a1.05,1.05 0 0 1 1.8,0.74l0,4c1.09,0 2.64,0 4.48,0l0.72,0l1,0.06a12.86,12.86 0 0 1 2,0.33a13,13 0 0 1 4,1.68a13.22,13.22 0 0 1 5.56,7.17a9,9 0 0 1 0.31,1.13a10,10 0 0 1 0.21,1.22l0.07,0.63c0,0.21 0,0.33 0,0.49l0,0.83l-0.08,0.07z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before 
(image error) Size: 2.4 KiB |
17
media/green-flag.svg
Normal file
17
media/green-flag.svg
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="greenflag" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#45993D;}
|
||||
.st1{fill:#4CBF56;}
|
||||
</style>
|
||||
<title>greenflag</title>
|
||||
<path class="st0" d="M20.8,3.7c-0.4-0.2-0.9-0.1-1.2,0.2c-2,1.6-4.8,1.6-6.8,0c-2.3-1.9-5.6-2.3-8.3-1V2.5c0-0.6-0.5-1-1-1
|
||||
s-1,0.4-1,1v18.8c0,0.5,0.5,1,1,1h0.1c0.5,0,1-0.5,1-1v-6.4c1-0.7,2.1-1.2,3.4-1.3c1.2,0,2.4,0.4,3.4,1.2c2.9,2.3,7,2.3,9.8,0
|
||||
c0.3-0.2,0.4-0.5,0.4-0.9V4.7C21.6,4.2,21.3,3.8,20.8,3.7z M20.5,13.9C20.5,13.9,20.5,13.9,20.5,13.9C18,16,14.4,16,11.9,14
|
||||
c-1.1-0.9-2.5-1.4-4-1.4c-1.2,0.1-2.3,0.5-3.4,1.1V4C7,2.6,10,2.9,12.2,4.6c2.4,1.9,5.7,1.9,8.1,0c0.1,0,0.1,0,0.2,0
|
||||
c0,0,0.1,0.1,0.1,0.1L20.5,13.9z"/>
|
||||
<path class="st1" d="M20.6,4.8l-0.1,9.1c0,0,0,0.1,0,0.1c-2.5,2-6.1,2-8.6,0c-1.1-0.9-2.5-1.4-4-1.4c-1.2,0.1-2.3,0.5-3.4,1.1V4
|
||||
C7,2.6,10,2.9,12.2,4.6c2.4,1.9,5.7,1.9,8.1,0c0.1,0,0.1,0,0.2,0C20.5,4.7,20.6,4.7,20.6,4.8z"/>
|
||||
</svg>
|
||||
|
After 
(image error) Size: 1.2 KiB |
18
media/repeat.svg
Normal file
18
media/repeat.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="repeat" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#CF8B17;}
|
||||
.st1{fill:#FFFFFF;}
|
||||
</style>
|
||||
<title>repeat</title>
|
||||
<path class="st0" d="M23.3,11c-0.3,0.6-0.9,1-1.5,1h-1.6c-0.1,1.3-0.5,2.5-1.1,3.6c-0.9,1.7-2.3,3.2-4.1,4.1
|
||||
c-1.7,0.9-3.6,1.2-5.5,0.9c-1.8-0.3-3.5-1.1-4.9-2.3c-0.7-0.7-0.7-1.9,0-2.6c0.6-0.6,1.6-0.7,2.3-0.2H7c0.9,0.6,1.9,0.9,2.9,0.9
|
||||
s1.9-0.3,2.7-0.9c1.1-0.8,1.8-2.1,1.8-3.5h-1.5c-0.9,0-1.7-0.7-1.7-1.7c0-0.4,0.2-0.9,0.5-1.2l4.4-4.4c0.7-0.6,1.7-0.6,2.4,0L23,9.2
|
||||
C23.5,9.7,23.6,10.4,23.3,11z"/>
|
||||
<path class="st1" d="M21.8,11h-2.6c0,1.5-0.3,2.9-1,4.2c-0.8,1.6-2.1,2.8-3.7,3.6c-1.5,0.8-3.3,1.1-4.9,0.8c-1.6-0.2-3.2-1-4.4-2.1
|
||||
c-0.4-0.3-0.4-0.9-0.1-1.2c0.3-0.4,0.9-0.4,1.2-0.1l0,0c1,0.7,2.2,1.1,3.4,1.1s2.3-0.3,3.3-1c0.9-0.6,1.6-1.5,2-2.6
|
||||
c0.3-0.9,0.4-1.8,0.2-2.8h-2.4c-0.4,0-0.7-0.3-0.7-0.7c0-0.2,0.1-0.3,0.2-0.4l4.4-4.4c0.3-0.3,0.7-0.3,0.9,0L22,9.8
|
||||
c0.3,0.3,0.4,0.6,0.3,0.9S22,11,21.8,11z"/>
|
||||
</svg>
|
||||
|
After 
(image error) Size: 1.2 KiB |
1
media/rotate-left.svg
Normal file
1
media/rotate-left.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg id="rotate-clockwise" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#3d79cc;}.cls-2{fill:#fff;}</style></defs><title>rotate-clockwise</title><path class="cls-1" d="M20.34,18.21a10.24,10.24,0,0,1-8.1,4.22,2.26,2.26,0,0,1-.16-4.52h0a5.58,5.58,0,0,0,4.25-2.53,5.06,5.06,0,0,0,.54-4.62A4.25,4.25,0,0,0,15.55,9a4.31,4.31,0,0,0-2-.8A4.82,4.82,0,0,0,10.4,9l1.12,1.41A1.59,1.59,0,0,1,10.36,13H2.67a1.56,1.56,0,0,1-1.26-.63A1.54,1.54,0,0,1,1.13,11L2.85,3.57A1.59,1.59,0,0,1,4.38,2.4,1.57,1.57,0,0,1,5.62,3L6.7,4.35a10.66,10.66,0,0,1,7.72-1.68A9.88,9.88,0,0,1,19,4.81,9.61,9.61,0,0,1,21.83,9,10.08,10.08,0,0,1,20.34,18.21Z"/><path class="cls-2" d="M19.56,17.65a9.29,9.29,0,0,1-7.35,3.83,1.31,1.31,0,0,1-.08-2.62,6.53,6.53,0,0,0,5-2.92,6.05,6.05,0,0,0,.67-5.51,5.32,5.32,0,0,0-1.64-2.16,5.21,5.21,0,0,0-2.48-1A5.86,5.86,0,0,0,9,8.84L10.74,11a.59.59,0,0,1-.43,1H2.7a.6.6,0,0,1-.6-.75L3.81,3.83a.59.59,0,0,1,1-.21l1.67,2.1a9.71,9.71,0,0,1,7.75-2.07,8.84,8.84,0,0,1,4.12,1.92,8.68,8.68,0,0,1,2.54,3.72A9.14,9.14,0,0,1,19.56,17.65Z"/></svg>
|
||||
|
After 
(image error) Size: 1 KiB |
1
media/rotate-right.svg
Normal file
1
media/rotate-right.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg id="rotate-counter-clockwise" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#3d79cc;}.cls-2{fill:#fff;}</style></defs><title>rotate-counter-clockwise</title><path class="cls-1" d="M22.68,12.2a1.6,1.6,0,0,1-1.27.63H13.72a1.59,1.59,0,0,1-1.16-2.58l1.12-1.41a4.82,4.82,0,0,0-3.14-.77,4.31,4.31,0,0,0-2,.8,4.25,4.25,0,0,0-1.34,1.73,5.06,5.06,0,0,0,.54,4.62A5.58,5.58,0,0,0,12,17.74h0a2.26,2.26,0,0,1-.16,4.52A10.25,10.25,0,0,1,3.74,18,10.14,10.14,0,0,1,2.25,8.78,9.7,9.7,0,0,1,5.08,4.64,9.92,9.92,0,0,1,9.66,2.5a10.66,10.66,0,0,1,7.72,1.68l1.08-1.35a1.57,1.57,0,0,1,1.24-.6,1.6,1.6,0,0,1,1.54,1.21l1.7,7.37A1.57,1.57,0,0,1,22.68,12.2Z"/><path class="cls-2" d="M21.38,11.83H13.77a.59.59,0,0,1-.43-1l1.75-2.19a5.9,5.9,0,0,0-4.7-1.58,5.07,5.07,0,0,0-4.11,3.17A6,6,0,0,0,7,15.77a6.51,6.51,0,0,0,5,2.92,1.31,1.31,0,0,1-.08,2.62,9.3,9.3,0,0,1-7.35-3.82A9.16,9.16,0,0,1,3.17,9.12,8.51,8.51,0,0,1,5.71,5.4,8.76,8.76,0,0,1,9.82,3.48a9.71,9.71,0,0,1,7.75,2.07l1.67-2.1a.59.59,0,0,1,1,.21L22,11.08A.59.59,0,0,1,21.38,11.83Z"/></svg>
|
||||
|
After 
(image error) Size: 1 KiB |
Binary file not shown.
|
Before 
(image error) Size: 353 B |
Binary file not shown.
|
Before 
(image error) Size: 344 B |
Loading…
Add table
Add a link
Reference in a new issue