Skip to content

Devtools conflict with theme3 #2148

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
WorldLanguages merged 2 commits into from
Apr 22, 2021
Merged

Devtools conflict with theme3 #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2c1c9
init
TheColaber Apr 13, 2021
4dd7a9b
Merge branch 'master' into devtools-bugfix
TheColaber Apr 18, 2021
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
5 changes: 2 additions & 3 deletions addons/editor-devtools/blockly/BlockFlasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,19 @@ export default class BlockFlasher {
static flash(block) {
if (myFlash.timerID > 0) {
clearTimeout(myFlash.timerID);
myFlash.block.svgPath_.style.fill = myFlash.colour;
myFlash.block.svgPath_.style.fill = "";
}

let count = 4;
let flashOn = true;
myFlash.colour = block.getColour();
myFlash.block = block;

/**
* Internal method to switch the colour of a block between light yellow and it's original colour
* @private
*/
function _flash() {
myFlash.block.svgPath_.style.fill = flashOn ? "#ffff80" : myFlash.colour;
myFlash.block.svgPath_.style.fill = flashOn ? "#ffff80" : "";
flashOn = !flashOn;
count--;
if (count > 0) {
Expand Down
4 changes: 2 additions & 2 deletions addons/editor-theme3/theme3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ export default async function ({ addon, global, console }) {
background-color: var(--editorTheme3-${categories[prop].var ? categories[prop].var : prop}Color) !important;
}
.blocklyDropDownDiv[data-category="${prop}"] {
background-color: var(--editorTheme3-${categories[prop].var ? categories[prop].var : prop}Color) !important;
background-color: var(--editorTheme3-${categories[prop].var ? categories[prop].var : prop}Color);
}
`;
if (prop === "custom") {
stylesheet += `path.blocklyBlockBackground[fill="#FF6680"] {
fill: var(--editorTheme3-${prop}Color) !important;
fill: var(--editorTheme3-${prop}Color);
}`;
}
if (prop === "sensing") {
Expand Down