From e829b578b30df1e01da225bab46de332a205893c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anian=20B=C3=BChler?= <anian.buehler@reutlingen-university.de> Date: Tue, 9 Feb 2021 15:44:05 +0100 Subject: [PATCH] Changed color and handling of comment-block --- .../com/ardublock/block/ardublock.xml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index 7009af6..ad61dcd 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -111,7 +111,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="if" kind="command" initlabel="bg.if" color="255 221 0"> + <BlockGenus name="if" kind="command" initlabel="bg.if" color="255 200 0"> <description> <text> If @@ -123,7 +123,7 @@ </BlockConnectors> </BlockGenus> - <BlockGenus name="elseif" kind="command" initlabel="bg.elseif" color="255 221 0"> + <BlockGenus name="elseif" kind="command" initlabel="bg.elseif" color="255 200 0"> <description> <text> ElseIf @@ -134,7 +134,7 @@ <BlockConnector label="bc.then" connector-kind="socket" connector-type="cmd" /> </BlockConnectors> </BlockGenus> - <BlockGenus name="else" kind="command" initlabel="bg.else" color="255 221 0"> + <BlockGenus name="else" kind="command" initlabel="bg.else" color="255 200 0"> <description> <text> Else @@ -2531,7 +2531,7 @@ <BlockGenus name="codeDivider1" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.codeDivider1" color="150 150 150" /> <BlockGenus name="codeDivider2" kind="command" is-starter="yes" is-terminator="yes" initlabel="bg.codeDivider2" color="150 150 150" /> - <BlockGenus name="program_comment" kind="command" color="58 65 65" initlabel="bg.program_comment" is-starter="yes" is-terminator="yes" label-unique="no"> + <BlockGenus name="program_comment" kind="command" color="98 105 105" initlabel="bg.program_comment" is-starter="yes" is-terminator="yes" label-unique="no"> <description> <text>add comment</text> </description> @@ -2555,7 +2555,7 @@ </BlockConnector> </BlockConnectors> </BlockGenus> - <BlockGenus name="code_loop" kind="command" color="0 176 80" editable-label="yes" initlabel="bg.code_loop"> + <BlockGenus name="code_loop" kind="command" color="0 150 156" editable-label="yes" initlabel="bg.code_loop"> <description> <text>add custom code</text> </description> @@ -2565,7 +2565,7 @@ </BlockConnector> </BlockConnectors>--> </BlockGenus> - <BlockGenus name="code_head" kind="command" color="0 176 80" editable-label="yes" initlabel="bg.code_head"> + <BlockGenus name="code_head" kind="command" color="0 150 156" editable-label="yes" initlabel="bg.code_head"> <description> <text>add custom code</text> </description> @@ -2575,7 +2575,7 @@ </BlockConnector> </BlockConnectors>--> </BlockGenus> - <BlockGenus name="code_comment_head" kind="command" color="58 65 65" editable-label="yes" initlabel="bg.code_comment_head"> + <BlockGenus name="code_comment_head" kind="command" color="98 105 105" editable-label="yes" initlabel="bg.code_comment_head"> <description> <text>add comment to program head</text> </description> @@ -2585,7 +2585,7 @@ </BlockConnector> </BlockConnectors>--> </BlockGenus> - <BlockGenus name="code_comment" kind="command" color="58 65 65" editable-label="yes" initlabel="bg.code_comment"> + <BlockGenus name="code_comment" kind="command" color="98 105 105" editable-label="yes" initlabel="bg.code_comment"> <description> <text>add comment</text> </description> @@ -3097,12 +3097,13 @@ <BlockGenusMember>sd_file_available</BlockGenusMember> </BlockDrawer> - <BlockDrawer button-color="0 176 80" name="bd.code" type="default"> + <BlockDrawer button-color="0 150 156" name="bd.code" type="default"> <BlockGenusMember>program_comment</BlockGenusMember> <BlockGenusMember>code_comment</BlockGenusMember> <BlockGenusMember>code_comment_head</BlockGenusMember> </BlockDrawer> - <BlockDrawer button-color="0 176 80" name="bd.code" type="custom"> + <BlockDrawer button-color="0 150 156" name="bd.code" type="custom"> + <!-- old color: 0 176 80 --> <BlockGenusMember>codeDivider1</BlockGenusMember> <BlockGenusMember>program_comment</BlockGenusMember> <BlockGenusMember>code_comment</BlockGenusMember> -- GitLab