From 5605fed9bcf77646d1cca4f60802851b5ef10664 Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Wed, 21 Jun 2023 10:18:30 -0400 Subject: [PATCH 1/7] C2LC-688: Add the new Music Band background Still to do: * Cell descriptions * Description for the background (MusicBand.label) * Thumbnail hover styling --- src/WorldSelector.js | 1 + src/WorldSelector.test.js | 11 +- src/Worlds.js | 31 +++ src/Worlds.scss | 54 ++++ src/messages.json | 3 + src/svg/MusicBand.svg | 300 +++++++++++++++++++++++ src/svg/MusicBandBaton.svg | 13 + src/svg/MusicBandBatonContrast.svg | 11 + src/svg/MusicBandBatonGray.svg | 13 + src/svg/MusicBandContrast.svg | 325 +++++++++++++++++++++++++ src/svg/MusicBandGray.svg | 300 +++++++++++++++++++++++ src/svg/MusicBandThumbnail.svg | 11 + src/svg/MusicBandThumbnailContrast.svg | 11 + src/svg/MusicBandThumbnailGray.svg | 11 + 14 files changed, 1090 insertions(+), 5 deletions(-) create mode 100644 src/svg/MusicBand.svg create mode 100644 src/svg/MusicBandBaton.svg create mode 100644 src/svg/MusicBandBatonContrast.svg create mode 100644 src/svg/MusicBandBatonGray.svg create mode 100644 src/svg/MusicBandContrast.svg create mode 100644 src/svg/MusicBandGray.svg create mode 100644 src/svg/MusicBandThumbnail.svg create mode 100644 src/svg/MusicBandThumbnailContrast.svg create mode 100644 src/svg/MusicBandThumbnailGray.svg diff --git a/src/WorldSelector.js b/src/WorldSelector.js index 2cdbc112..a461bda2 100644 --- a/src/WorldSelector.js +++ b/src/WorldSelector.js @@ -47,6 +47,7 @@ class WorldSelector extends React.Component { test('All worlds should be displayed as options and only one is checked', () => { - expect.assertions(27); + expect.assertions(29); const { wrapper } = createMountWorldSelector(); const selectorOptions = getWorldSelectorRadioButton(wrapper); - expect(selectorOptions.length).toBe(13); + expect(selectorOptions.length).toBe(14); expect(selectorOptions.get(0).props.value).toBe('Sketchpad'); expect(selectorOptions.get(1).props.value).toBe('AmusementPark'); @@ -82,9 +82,10 @@ describe('When rendering selector options', () => { expect(selectorOptions.get(7).props.value).toBe('Haunted'); expect(selectorOptions.get(8).props.value).toBe('Landmarks'); expect(selectorOptions.get(9).props.value).toBe('Marble'); - expect(selectorOptions.get(10).props.value).toBe('Savannah'); - expect(selectorOptions.get(11).props.value).toBe('Space'); - expect(selectorOptions.get(12).props.value).toBe('Sports'); + expect(selectorOptions.get(10).props.value).toBe('MusicBand'); + expect(selectorOptions.get(11).props.value).toBe('Savannah'); + expect(selectorOptions.get(12).props.value).toBe('Space'); + expect(selectorOptions.get(13).props.value).toBe('Sports'); expect(selectorOptions.get(0).props.checked).toBe(true); for (let i = 1; i < selectorOptions.length; i++) { diff --git a/src/Worlds.js b/src/Worlds.js index be0ec5c9..a5acd4aa 100644 --- a/src/Worlds.js +++ b/src/Worlds.js @@ -102,6 +102,18 @@ import { ReactComponent as Marble } from './svg/Marble.svg'; import { ReactComponent as MarbleGray } from './svg/MarbleGray.svg'; import { ReactComponent as MarbleContrast } from './svg/MarbleContrast.svg'; +// Music Band + +import { ReactComponent as MusicBand } from './svg/MusicBand.svg'; +import { ReactComponent as MusicBandGray } from './svg/MusicBandGray.svg'; +import { ReactComponent as MusicBandContrast } from './svg/MusicBandContrast.svg'; +import { ReactComponent as MusicBandThumbnail } from './svg/MusicBandThumbnail.svg'; +import { ReactComponent as MusicBandThumbnailGray } from './svg/MusicBandThumbnailGray.svg'; +import { ReactComponent as MusicBandThumbnailContrast } from './svg/MusicBandThumbnailContrast.svg'; +import { ReactComponent as MusicBandBaton } from './svg/MusicBandBaton.svg'; +import { ReactComponent as MusicBandBatonGray } from './svg/MusicBandBatonGray.svg'; +import { ReactComponent as MusicBandBatonContrast } from './svg/MusicBandBatonContrast.svg'; + // Savannah import { ReactComponent as Savannah } from './svg/Savannah.svg'; import { ReactComponent as SavannahGray } from './svg/Savannah-gray.svg'; @@ -172,6 +184,7 @@ const worlds: {| 'Haunted': WorldProperties, 'Landmarks': WorldProperties, 'Marble': WorldProperties, + 'MusicBand': WorldProperties, 'Savannah': WorldProperties, 'Sketchpad': WorldProperties, 'Space': WorldProperties, @@ -846,6 +859,24 @@ const worlds: {| startingDirection: 2, // East enableFlipCharacter: false }, + 'MusicBand': { + background: MusicBand, + backgroundGray: MusicBandGray, + backgroundContrast: MusicBandContrast, + backgroundInfo : { + }, + thumbnail: MusicBandThumbnail, + thumbnailDark: MusicBandThumbnail, + thumbnailGray: MusicBandThumbnailGray, + thumbnailContrast: MusicBandThumbnailContrast, + character: MusicBandBaton, + characterGray: MusicBandBatonGray, + characterContrast: MusicBandBatonContrast, + startingX: 1, + startingY: 2, + startingDirection: 2, // East + enableFlipCharacter: true + }, 'Savannah': { background: Savannah, backgroundGray: SavannahGray, diff --git a/src/Worlds.scss b/src/Worlds.scss index db9c752a..2856117e 100644 --- a/src/Worlds.scss +++ b/src/Worlds.scss @@ -970,6 +970,60 @@ body.contrast-theme { } } +/* Music Band */ + +.ProgramBlockEditor__character-column-character-container--MusicBand { + background-color: #FBE6CD; +} + +.Scene__grid-line--MusicBand { + stroke: #567F88; +} + +.Scene__path-line--MusicBand { + stroke: #E5AF5E; +} + +.Scene__starting-grid-cell-point--MusicBand { + fill: #E5AF5E; +} + +body.gray-theme { + .ProgramBlockEditor__character-column-character-container--MusicBand { + background-color: #FFFFFF; + } + + .Scene__grid-line--MusicBand { + stroke: #7F8898; + } + + .Scene__path-line--MusicBand { + stroke: #FFFFFF; + } + + .Scene__starting-grid-cell-point--MusicBand { + fill: #FFFFFF; + } +} + +body.contrast-theme { + .ProgramBlockEditor__character-column-character-container--MusicBand { + background-color: #FFFFFF; + } + + .Scene__grid-line--MusicBand { + stroke: #0078FF; + } + + .Scene__path-line--MusicBand { + stroke: #FF0000; + } + + .Scene__starting-grid-cell-point--MusicBand { + fill: #FF0000; + } +} + /* Sketchpad */ .ProgramBlockEditor__character-column-character-container--Sketchpad { diff --git a/src/messages.json b/src/messages.json index 0fd26156..985a10cd 100644 --- a/src/messages.json +++ b/src/messages.json @@ -375,6 +375,9 @@ "Marble.character": "the marble", "Marble.label": "A maze made of bricks in different colours. Your character in this scene is a marble. There is a path through the maze that starts where your marble is and there are multiple ways to escape the maze.", "Marble.name": "Marble Run", + "MusicBand.character": "the baton", + "MusicBand.label": "TODO", + "MusicBand.name": "Music Band", "PenDownToggleSwitch.penDown": "Pen down", "PlayButton.play": "Play", "PlayButton.pause": "Pause", diff --git a/src/svg/MusicBand.svg b/src/svg/MusicBand.svg new file mode 100644 index 00000000..773a43fd --- /dev/null +++ b/src/svg/MusicBand.svg @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/svg/MusicBandBaton.svg b/src/svg/MusicBandBaton.svg new file mode 100644 index 00000000..eace2e21 --- /dev/null +++ b/src/svg/MusicBandBaton.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/svg/MusicBandBatonContrast.svg b/src/svg/MusicBandBatonContrast.svg new file mode 100644 index 00000000..98040ba0 --- /dev/null +++ b/src/svg/MusicBandBatonContrast.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/svg/MusicBandBatonGray.svg b/src/svg/MusicBandBatonGray.svg new file mode 100644 index 00000000..6a7da394 --- /dev/null +++ b/src/svg/MusicBandBatonGray.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/svg/MusicBandContrast.svg b/src/svg/MusicBandContrast.svg new file mode 100644 index 00000000..05935b04 --- /dev/null +++ b/src/svg/MusicBandContrast.svg @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/svg/MusicBandGray.svg b/src/svg/MusicBandGray.svg new file mode 100644 index 00000000..7304acd3 --- /dev/null +++ b/src/svg/MusicBandGray.svg @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/svg/MusicBandThumbnail.svg b/src/svg/MusicBandThumbnail.svg new file mode 100644 index 00000000..5d01af07 --- /dev/null +++ b/src/svg/MusicBandThumbnail.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/svg/MusicBandThumbnailContrast.svg b/src/svg/MusicBandThumbnailContrast.svg new file mode 100644 index 00000000..a8ece830 --- /dev/null +++ b/src/svg/MusicBandThumbnailContrast.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/svg/MusicBandThumbnailGray.svg b/src/svg/MusicBandThumbnailGray.svg new file mode 100644 index 00000000..a095809d --- /dev/null +++ b/src/svg/MusicBandThumbnailGray.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + From 92b685f65b44ebc6e3f4a523c0d181f0e40b998b Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Wed, 21 Jun 2023 11:32:09 -0400 Subject: [PATCH 2/7] C2LC-688: Update the Music Band background images * Reduce the number of strings on the guitar and change the angle of the neck to 45 degrees, to remove rendering artifacts * Change the colour of the top and sides of the grayscale and high contrast versions so that they don't blend into the Weavly UI --- src/svg/MusicBand.svg | 111 +++++++++++----------- src/svg/MusicBandContrast.svg | 171 +++++++++++++++++----------------- src/svg/MusicBandGray.svg | 115 +++++++++++------------ 3 files changed, 194 insertions(+), 203 deletions(-) diff --git a/src/svg/MusicBand.svg b/src/svg/MusicBand.svg index 773a43fd..5da24ff3 100644 --- a/src/svg/MusicBand.svg +++ b/src/svg/MusicBand.svg @@ -1,37 +1,34 @@ - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -42,14 +39,14 @@ - - + + - - + + - - + + @@ -83,14 +80,14 @@ - + - + - + @@ -100,7 +97,7 @@ - + @@ -127,7 +124,7 @@ - + @@ -138,12 +135,12 @@ - + - + @@ -167,7 +164,7 @@ - + @@ -210,7 +207,7 @@ - + @@ -247,53 +244,53 @@ - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + diff --git a/src/svg/MusicBandContrast.svg b/src/svg/MusicBandContrast.svg index 05935b04..0a3e13be 100644 --- a/src/svg/MusicBandContrast.svg +++ b/src/svg/MusicBandContrast.svg @@ -1,74 +1,30 @@ - - + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - + @@ -131,18 +87,18 @@ - + - + - + - + @@ -212,15 +168,15 @@ - + - + - + - + @@ -267,32 +223,68 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - + @@ -302,22 +294,27 @@ - - - - - + + + + + + - + - + + + + + diff --git a/src/svg/MusicBandGray.svg b/src/svg/MusicBandGray.svg index 7304acd3..50996f0a 100644 --- a/src/svg/MusicBandGray.svg +++ b/src/svg/MusicBandGray.svg @@ -1,37 +1,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -42,14 +17,14 @@ + + + - + - - - - + @@ -157,17 +132,17 @@ - - - + + + - + - + - - + + @@ -176,10 +151,10 @@ - - - - + + + + @@ -210,7 +185,7 @@ - + @@ -245,29 +220,46 @@ + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - + - + - + @@ -277,22 +269,27 @@ - - - - - + + + + + + - + - + + + + + From 3ad2e62344d6015033fe999971db9323bfef84cc Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Wed, 21 Jun 2023 13:54:34 -0400 Subject: [PATCH 3/7] C2LC-688: Add Music Band thumbnail hover styling --- src/Worlds.scss | 67 ++++++++++++++++++++++++++ src/svg/MusicBandThumbnail.svg | 18 +++---- src/svg/MusicBandThumbnailContrast.svg | 18 +++---- src/svg/MusicBandThumbnailGray.svg | 18 +++---- 4 files changed, 94 insertions(+), 27 deletions(-) diff --git a/src/Worlds.scss b/src/Worlds.scss index 2856117e..7bc3fa49 100644 --- a/src/Worlds.scss +++ b/src/Worlds.scss @@ -988,6 +988,32 @@ body.contrast-theme { fill: #E5AF5E; } +.WorldSelector__option-image--MusicBand:hover { + svg { + .thumbnail-background { + fill: #73A9B0; + } + .thumbnail-purple { + fill: #AA6F9C; + } + .thumbnail-red { + fill: #EA7362; + } + .thumbnail-yellow { + fill: #F1AE5B; + } + .thumbnail-green { + fill: #4C9990; + } + .thumbnail-blue { + fill: #516D95; + } + .thumbnail-note { + fill: #0B0F14; + } + } +} + body.gray-theme { .ProgramBlockEditor__character-column-character-container--MusicBand { background-color: #FFFFFF; @@ -1004,6 +1030,32 @@ body.gray-theme { .Scene__starting-grid-cell-point--MusicBand { fill: #FFFFFF; } + + .WorldSelector__option-image--MusicBand:hover { + svg { + .thumbnail-background { + fill: #B9BEC6; + } + .thumbnail-purple { + fill: #67717E; + } + .thumbnail-red { + fill: #818A98; + } + .thumbnail-yellow { + fill: #9DA4AF; + } + .thumbnail-green { + fill: #B9BEC6; + } + .thumbnail-blue { + fill: #D5D8DD; + } + .thumbnail-note { + fill: #22262A; + } + } + } } body.contrast-theme { @@ -1022,6 +1074,21 @@ body.contrast-theme { .Scene__starting-grid-cell-point--MusicBand { fill: #FF0000; } + + .WorldSelector__option-image--MusicBand:hover { + svg { + .thumbnail-background { + fill: #1E1E1E; + } + .thumbnail-stripe { + fill: #1E1E1E; + stroke: #FFFFFF; + } + .thumbnail-note { + fill: #FFFFFF; + } + } + } } /* Sketchpad */ diff --git a/src/svg/MusicBandThumbnail.svg b/src/svg/MusicBandThumbnail.svg index 5d01af07..c76223f9 100644 --- a/src/svg/MusicBandThumbnail.svg +++ b/src/svg/MusicBandThumbnail.svg @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/svg/MusicBandThumbnailContrast.svg b/src/svg/MusicBandThumbnailContrast.svg index a8ece830..06f7c68f 100644 --- a/src/svg/MusicBandThumbnailContrast.svg +++ b/src/svg/MusicBandThumbnailContrast.svg @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/svg/MusicBandThumbnailGray.svg b/src/svg/MusicBandThumbnailGray.svg index a095809d..6c7f7e5c 100644 --- a/src/svg/MusicBandThumbnailGray.svg +++ b/src/svg/MusicBandThumbnailGray.svg @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + From 1267b6c8dcda189e9c1cf0872d245c1b2e49e29b Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Wed, 21 Jun 2023 14:54:48 -0400 Subject: [PATCH 4/7] C2LC-688: Add Music Band scene and cell descriptions --- src/Worlds.js | 40 ++++++++++++++++++++++++++++++++++++++++ src/messages.json | 11 ++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/Worlds.js b/src/Worlds.js index a5acd4aa..652e70db 100644 --- a/src/Worlds.js +++ b/src/Worlds.js @@ -864,6 +864,46 @@ const worlds: {| backgroundGray: MusicBandGray, backgroundContrast: MusicBandContrast, backgroundInfo : { + B1: 'spotlight', + E1: 'spotlight', + H1: 'spotlight', + K1: 'spotlight', + H2: 'drumKit', + J2: 'saxophone', + K2: 'saxophone', + B3: 'guitar', + C3: 'guitar', + F3: 'drumKit', + G3: 'drumKit', + H3: 'drumKit', + J3: 'saxophone', + K3: 'saxophone', + B4: 'guitar', + C4: 'guitar', + F4: 'drumKit', + G4: 'drumKit', + H4: 'drumKit', + F5: 'drumKit', + G5: 'drumKit', + H5: 'drumKit', + A6: 'tambourine', + F6: 'microphone', + H6: 'synthesizer', + I6: 'synthesizer', + J6: 'synthesizer', + K6: 'synthesizer', + A7: 'loudspeaker', + C7: 'xylophone', + D7: 'xylophone', + F7: 'microphone', + H7: 'synthesizer', + I7: 'synthesizer', + J7: 'synthesizer', + L7: 'loudspeaker', + A8: 'loudspeaker', + F8: 'microphone', + I8: 'synthesizer', + L8: 'loudspeaker' }, thumbnail: MusicBandThumbnail, thumbnailDark: MusicBandThumbnail, diff --git a/src/messages.json b/src/messages.json index 985a10cd..60df2e93 100644 --- a/src/messages.json +++ b/src/messages.json @@ -376,8 +376,17 @@ "Marble.label": "A maze made of bricks in different colours. Your character in this scene is a marble. There is a path through the maze that starts where your marble is and there are multiple ways to escape the maze.", "Marble.name": "Marble Run", "MusicBand.character": "the baton", - "MusicBand.label": "TODO", + "MusicBand.drumKit": "the drum kit", + "MusicBand.guitar": "the guitar", + "MusicBand.label": "A music band scene with musical instruments. The instruments are arranged in 2 rows, with one row in the middle of the scene and one towards the bottom of the scene. In the upper row, there is a guitar, a drum kit, and a saxophone. In the lower row, there is a tambourine, a xylophone with a mallet, a microphone on a stand, and a synthesizer. Across the top of the scene spotlights light the instruments. And in the lower left and right corners there are loudspeakers. Your character in this scene is a conductor's baton.", + "MusicBand.loudspeaker": "a loudspeaker", + "MusicBand.microphone": "the microphone on a stand", "MusicBand.name": "Music Band", + "MusicBand.saxophone": "the saxophone", + "MusicBand.spotlight": "a spotlight", + "MusicBand.synthesizer": "the synthesizer", + "MusicBand.tambourine": "the tambourine", + "MusicBand.xylophone": "the xylophone with mallet", "PenDownToggleSwitch.penDown": "Pen down", "PlayButton.play": "Play", "PlayButton.pause": "Pause", From f0d9abcfb1f34455905d715d57d44bd412b7288d Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Mon, 26 Jun 2023 09:57:48 -0400 Subject: [PATCH 5/7] C2LC-688: Improve drawing visibility on Music Band Grayscale --- src/svg/MusicBandGray.svg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/svg/MusicBandGray.svg b/src/svg/MusicBandGray.svg index 50996f0a..6be98ece 100644 --- a/src/svg/MusicBandGray.svg +++ b/src/svg/MusicBandGray.svg @@ -1,6 +1,6 @@ - + @@ -142,7 +142,7 @@ - + @@ -232,12 +232,12 @@ - - - - - - + + + + + + From f7de914eca18d27bfe5c3c8e3b51ebb765892795 Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Tue, 27 Jun 2023 09:28:42 -0400 Subject: [PATCH 6/7] C2LC-688: Update Music Band background images Adjust the size and colour of the background behind the stage to increase the visibility of the drawing line. --- src/svg/MusicBand.svg | 34 ++++++++++----------- src/svg/MusicBandContrast.svg | 57 +++++++++++++++++------------------ src/svg/MusicBandGray.svg | 2 +- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/src/svg/MusicBand.svg b/src/svg/MusicBand.svg index 5da24ff3..c0c918b1 100644 --- a/src/svg/MusicBand.svg +++ b/src/svg/MusicBand.svg @@ -1,9 +1,9 @@ - - + + - + @@ -22,12 +22,12 @@ - - - - - - + + + + + + @@ -80,14 +80,14 @@ - + - + - + @@ -97,7 +97,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -135,12 +135,12 @@ - + - + @@ -164,7 +164,7 @@ - + diff --git a/src/svg/MusicBandContrast.svg b/src/svg/MusicBandContrast.svg index 0a3e13be..89fbb511 100644 --- a/src/svg/MusicBandContrast.svg +++ b/src/svg/MusicBandContrast.svg @@ -1,7 +1,6 @@ - @@ -12,10 +11,10 @@ - + - + @@ -87,18 +86,18 @@ - + - + - + - + @@ -168,15 +167,15 @@ - + - + - + - + @@ -230,11 +229,11 @@ - + - + @@ -242,28 +241,28 @@ - + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + diff --git a/src/svg/MusicBandGray.svg b/src/svg/MusicBandGray.svg index 6be98ece..352107c2 100644 --- a/src/svg/MusicBandGray.svg +++ b/src/svg/MusicBandGray.svg @@ -1,7 +1,7 @@ - + From b9c6013982328f38a1e423443cba025b172fbddd Mon Sep 17 00:00:00 2001 From: Simon Bates Date: Tue, 27 Jun 2023 10:14:39 -0400 Subject: [PATCH 7/7] C2LC-688: Remove the 'synthesizer' label from Music Band I8 --- src/Worlds.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Worlds.js b/src/Worlds.js index 652e70db..6981c797 100644 --- a/src/Worlds.js +++ b/src/Worlds.js @@ -902,7 +902,6 @@ const worlds: {| L7: 'loudspeaker', A8: 'loudspeaker', F8: 'microphone', - I8: 'synthesizer', L8: 'loudspeaker' }, thumbnail: MusicBandThumbnail,