From c688e7b32aa49c2408daa956031c544f87a3679a Mon Sep 17 00:00:00 2001 From: Fabian Rassi Date: Tue, 10 Oct 2023 17:39:26 +0200 Subject: [PATCH] BLOCKS-332 add 'catblocks-' before CSS classes --- src/library/js/integration/catroid.js | 6 +++--- src/library/js/integration/share.js | 4 ++-- src/library/js/integration/utils.js | 2 +- src/library/scss/_blockly.scss | 2 +- src/library/scss/catroid.scss | 22 +++++++++++----------- src/library/scss/share.scss | 4 ++-- test/jsunit/share/share.test.js | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/library/js/integration/catroid.js b/src/library/js/integration/catroid.js index b71e459e..6e9d3700 100644 --- a/src/library/js/integration/catroid.js +++ b/src/library/js/integration/catroid.js @@ -293,7 +293,7 @@ export class Catroid { Android.updateScriptPosition(newEmptyBrickId, newEmptyBrickPositionX, newEmptyBrickPositionY); if (newEmptyBrick.pathObject && newEmptyBrick.pathObject.svgRoot) { - Blockly.utils.dom.addClass(newEmptyBrick.pathObject.svgRoot, 'catblockls-blockly-invisible'); + Blockly.utils.dom.addClass(newEmptyBrick.pathObject.svgRoot, 'catblocks-blockly-invisible'); } this.removeEmptyScriptBricks(); } else { @@ -665,11 +665,11 @@ export class Catroid { const catBlocksAddBrickDialog = document.getElementById('catroid-catblocks-add-brick-dialog'); if (catBlocksAddBrickDialog) { - catBlocksAddBrickDialog.classList.add('advanced-theme'); + catBlocksAddBrickDialog.classList.add('catblocks-advanced-theme'); } const brickContainer = document.getElementById('catroid-catblocks-bricks-container'); if (brickContainer) { - brickContainer.setAttribute('class', 'advanced-theme zelos-renderer'); + brickContainer.setAttribute('class', 'catblocks-advanced-theme zelos-renderer'); } } diff --git a/src/library/js/integration/share.js b/src/library/js/integration/share.js index 9d894f9b..eb0e6e29 100644 --- a/src/library/js/integration/share.js +++ b/src/library/js/integration/share.js @@ -717,7 +717,7 @@ export class Share { rightCol, 'button', { - class: 'btn btn-light search me-3', + class: 'btn btn-light catblocks-search me-3', id: magnifyingGlassID, 'data-bs-toggle': 'modal', 'data-bs-target': '#modalForImg' @@ -880,7 +880,7 @@ export class Share { ); const ul = generateNewDOM(container, 'ul', { - class: 'nav nav-tabs nav-fill catro-tabs', + class: 'nav nav-tabs nav-fill catblocks-tabs', id: `${objectID}-tabs`, role: 'tablist' }); diff --git a/src/library/js/integration/utils.js b/src/library/js/integration/utils.js index 8ff60992..c9d208e2 100644 --- a/src/library/js/integration/utils.js +++ b/src/library/js/integration/utils.js @@ -430,7 +430,7 @@ export const renderBrick = (parentBrick, jsonBrick, brickListType, workspace, re if (childBrick.pathObject && childBrick.pathObject.svgRoot) { if (jsonBrick.name == 'EmptyScript') { - Blockly.utils.dom.addClass(childBrick.pathObject.svgRoot, 'catblockls-blockly-invisible'); + Blockly.utils.dom.addClass(childBrick.pathObject.svgRoot, 'catblocks-blockly-invisible'); } else if (jsonBrick.commentedOut) { Blockly.utils.dom.addClass(childBrick.pathObject.svgRoot, 'catblocks-blockly-disabled'); if (workspace.getTheme().name.toLowerCase() === 'advanced') { diff --git a/src/library/scss/_blockly.scss b/src/library/scss/_blockly.scss index 4fcd1c40..4fc73dbc 100644 --- a/src/library/scss/_blockly.scss +++ b/src/library/scss/_blockly.scss @@ -40,7 +40,7 @@ word-wrap: break-word; } -.catblockls-blockly-invisible > .blocklyPath { +.catblocks-blockly-invisible > .blocklyPath { fill-opacity: 0; stroke-opacity: 0; } diff --git a/src/library/scss/catroid.scss b/src/library/scss/catroid.scss index 6a72082a..f14bd503 100644 --- a/src/library/scss/catroid.scss +++ b/src/library/scss/catroid.scss @@ -98,32 +98,32 @@ body, margin-top: 5px; } -.advanced-theme .blocklyNonEditableText > rect:not(.blocklyDropdownRect), -.advanced-theme .blocklyEditableText > rect:not(.blocklyDropdownRect) { +.catblocks-advanced-theme .blocklyNonEditableText > rect:not(.blocklyDropdownRect), +.catblocks-advanced-theme .blocklyEditableText > rect:not(.blocklyDropdownRect) { fill: #1a1a1a !important; } -.advanced-theme .blocklyNonEditableText > text, -.advanced-theme .blocklyEditableText > text, -.advanced-theme .blocklyNonEditableText > g > text, -.advanced-theme .blocklyEditableText > g > text { +.catblocks-advanced-theme .blocklyNonEditableText > text, +.catblocks-advanced-theme .blocklyEditableText > text, +.catblocks-advanced-theme .blocklyNonEditableText > g > text, +.catblocks-advanced-theme .blocklyEditableText > g > text { fill: #fff !important; } -.advanced-theme#catroid-catblocks-add-brick-dialog { +.catblocks-advanced-theme#catroid-catblocks-add-brick-dialog { background-color: #1a1a1a !important; } -.advanced-theme .blocklyMainBackground { +.catblocks-advanced-theme .blocklyMainBackground { stroke-width: 0 !important; } -.advanced-theme #catroid-catblocks-add-brick-dialog-header { +.catblocks-advanced-theme #catroid-catblocks-add-brick-dialog-header { background-color: #3c3c3c !important; } -.advanced-theme #catroid-catblocks-add-brick-text-container { +.catblocks-advanced-theme #catroid-catblocks-add-brick-text-container { color: #b3b3b3 !important; } -.advanced-theme #catroid-catblocks-add-brick-dialog-header img { +.catblocks-advanced-theme #catroid-catblocks-add-brick-dialog-header img { filter: brightness(0) invert(0.8); } diff --git a/src/library/scss/share.scss b/src/library/scss/share.scss index f6751701..a637ea11 100644 --- a/src/library/scss/share.scss +++ b/src/library/scss/share.scss @@ -36,7 +36,7 @@ border-right: 4px solid $primary; } - .catro-tabs { + .catblocks-tabs { height: 100%; .nav-link { @@ -98,6 +98,6 @@ } } -.search { +.catblocks-search { width: 3em; } diff --git a/test/jsunit/share/share.test.js b/test/jsunit/share/share.test.js index 90f13473..2d461c85 100644 --- a/test/jsunit/share/share.test.js +++ b/test/jsunit/share/share.test.js @@ -882,7 +882,7 @@ describe('Share catroid program rendering tests', () => { await page.click(tabID); - const searchID = '#' + objID + ' #' + objID + '-looks .search'; + const searchID = '#' + objID + ' #' + objID + '-looks .catblocks-search'; await page.waitForSelector(searchID, { visible: true }); await page.click(searchID); @@ -893,7 +893,7 @@ describe('Share catroid program rendering tests', () => { expect(itemContainerID).toBe(expectedID); const searchContainerInnerHTML = await page.$eval( - '#' + objID + ' #' + objID + '-looks .search', + '#' + objID + ' #' + objID + '-looks .catblocks-search', node => node.innerHTML ); const origin = await page.evaluate(() => { @@ -1281,7 +1281,7 @@ describe('Share catroid program rendering tests', () => { Test.Share.config.renderLooks = true; }, catObj); - const tabs = await page.$$('.catro-tabs .nav-item'); + const tabs = await page.$$('.catblocks-tabs .nav-item'); expect(tabs).toHaveLength(2); }); @@ -1355,7 +1355,7 @@ describe('Share catroid program rendering tests', () => { await page.click(tabID); - const searchID = '#' + objID + ' #' + objID + '-looks .search'; + const searchID = '#' + objID + ' #' + objID + '-looks .catblocks-search'; await page.waitForSelector(searchID, { visible: true }); const [magnifyingGlassWidth, magnifyingGlassHeight] = await page.$eval(`${searchID} img`, img => [ img.clientWidth,