Skip to content

Block color #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmwthunkable merged 9 commits into from
Apr 10, 2018
Merged

Block color #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1514796
demo of where to change the block colors
pmwthunkable Mar 21, 2018
30d249d
change build to access https closure compiler endpoint
pmwthunkable Mar 21, 2018
cbcbd00
update blockly color in blockly
Mar 28, 2018
e7221e9
Update function color
Mar 30, 2018
40946b0
Update logic setter color
Mar 30, 2018
2bd6cd6
remove irrelevant changes in the pr
pmwthunkable Apr 7, 2018
bdc4f47
removing added translation file
pmwthunkable Apr 7, 2018
1868b90
change loop color
pmwthunkable Apr 7, 2018
fe584f5
adjust logic, loops, and text block colors
pmwthunkable Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,386 changes: 1,330 additions & 2,056 deletions blockly_compressed.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion blocks/colour.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* This should be the same as Blockly.Msg.COLOUR_HUE.
* @readonly
*/
Blockly.Constants.Colour.HUE = 20;
Blockly.Constants.Colour.HUE = "#7F7F7F";
/** @deprecated Use Blockly.Constants.Colour.HUE */
Blockly.Blocks.colour.HUE = Blockly.Constants.Colour.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* This should be the same as Blockly.Msg.LISTS_HUE.
* @readonly
*/
Blockly.Constants.Lists.HUE = 260;
Blockly.Constants.Lists.HUE = "#76AFC9";
/** @deprecated Use Blockly.Constants.Lists.HUE */
Blockly.Blocks.lists.HUE = Blockly.Constants.Lists.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* Should be the same as Blockly.Msg.LOGIC_HUE.
* @readonly
*/
Blockly.Constants.Logic.HUE = 210;
Blockly.Constants.Logic.HUE = "#45B4A9";
/** @deprecated Use Blockly.Constants.Logic.HUE */
Blockly.Blocks.logic.HUE = Blockly.Constants.Logic.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/loops.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* Should be the same as Blockly.Msg.LOOPS_HUE
* @readonly
*/
Blockly.Constants.Loops.HUE = 120;
Blockly.Constants.Loops.HUE = "#F3AA44";
/** @deprecated Use Blockly.Constants.Loops.HUE */
Blockly.Blocks.loops.HUE = Blockly.Constants.Loops.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/math.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* Should be the same as Blockly.Msg.MATH_HUE
* @readonly
*/
Blockly.Constants.Math.HUE = 230;
Blockly.Constants.Math.HUE = "#6789CC";
/** @deprecated Use Blockly.Constants.Math.HUE */
Blockly.Blocks.math.HUE = Blockly.Constants.Math.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/procedures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ goog.require('Blockly.Blocks');
/**
* Common HSV hue for all blocks in this category.
*/
Blockly.Blocks.procedures.HUE = 290;
Blockly.Blocks.procedures.HUE = "#7560A4";

Blockly.Blocks['procedures_defnoreturn'] = {
/**
Expand Down
2 changes: 1 addition & 1 deletion blocks/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ goog.require('Blockly.Blocks');
* Should be the same as Blockly.Msg.TEXTS_HUE
* @readonly
*/
Blockly.Constants.Text.HUE = 160;
Blockly.Constants.Text.HUE = "#DF6078";
/** @deprecated Use Blockly.Constants.Text.HUE */
Blockly.Blocks.texts.HUE = Blockly.Constants.Text.HUE;

Expand Down
2 changes: 1 addition & 1 deletion blocks/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goog.require('Blockly.Blocks');
* Should be the same as Blockly.Msg.VARIABLES_HUE.
* @readonly
*/
Blockly.Constants.Variables.HUE = 330;
Blockly.Constants.Variables.HUE = "#FC8743";
/** @deprecated Use Blockly.Constants.Variables.HUE */
Blockly.Blocks.variables.HUE = Blockly.Constants.Variables.HUE;

Expand Down
28 changes: 14 additions & 14 deletions blocks_compressed.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def gen_generator(self, language):
def do_compile(self, params, target_filename, filenames, remove):
# Send the request to Google.
headers = {"Content-type": "application/x-www-form-urlencoded"}
conn = httplib.HTTPConnection("closure-compiler.appspot.com")
conn = httplib.HTTPSConnection("closure-compiler.appspot.com")
conn.request("POST", "/compile", urllib.urlencode(params), headers)
response = conn.getresponse()
json_str = response.read()
Expand Down