Skip to content
This repository was archived by the owner on Feb 5, 2026. It is now read-only.

BLOCKS-332 CSS Class Duplicates/Conflicts #441

Open
greilberger13 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

BLOCKS-332 CSS Class Duplicates/Conflicts #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/library/js/integration/catroid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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');
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/library/js/integration/share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
});
Expand Down
2 changes: 1 addition & 1 deletion src/library/js/integration/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion src/library/scss/_blockly.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
word-wrap: break-word;
}

.catblockls-blockly-invisible > .blocklyPath {
.catblocks-blockly-invisible > .blocklyPath {
fill-opacity: 0;
stroke-opacity: 0;
}
Expand Down
22 changes: 11 additions & 11 deletions src/library/scss/catroid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
4 changes: 2 additions & 2 deletions src/library/scss/share.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
border-right: 4px solid $primary;
}

.catro-tabs {
.catblocks-tabs {
height: 100%;

.nav-link {
Expand Down Expand Up @@ -98,6 +98,6 @@
}
}

.search {
.catblocks-search {
width: 3em;
}
8 changes: 4 additions & 4 deletions test/jsunit/share/share.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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(() => {
Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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,
Expand Down