Skip to content

Commit 0553560

Browse files
committed
add sidekick assets and settings
1 parent a15e83c commit 0553560

File tree

14 files changed

+286
-25
lines changed

14 files changed

+286
-25
lines changed

src/components/menu-bar/tw-theme-accent.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,19 @@ import {connect} from 'react-redux';
77
import check from './check.svg';
88
import dropdownCaret from './dropdown-caret.svg';
99
import {MenuItem, Submenu} from '../menu/menu.jsx';
10-
import {ACCENT_BLUE, ACCENT_MAP, ACCENT_PURPLE, ACCENT_RED, ACCENT_RAINBOW, Theme} from '../../lib/themes/index.js';
10+
import {ACCENT_BLUE, ACCENT_MAP, ACCENT_PURPLE, ACCENT_RED, ACCENT_GREEN, ACCENT_RAINBOW, Theme} from '../../lib/themes/index.js';
1111
import {openAccentMenu, accentMenuOpen, closeSettingsMenu} from '../../reducers/menus.js';
1212
import {setTheme} from '../../reducers/theme.js';
1313
import {persistTheme} from '../../lib/themes/themePersistance.js';
1414
import rainbowIcon from './tw-accent-rainbow.svg';
1515
import styles from './settings-menu.css';
1616

1717
const options = defineMessages({
18+
[ACCENT_GREEN]: {
19+
defaultMessage: 'Green',
20+
description: 'Name of the green color scheme, used by SIDEKICK by default.',
21+
id: 'tw.accent.green'
22+
},
1823
[ACCENT_RED]: {
1924
defaultMessage: 'Red',
2025
description: 'Name of the red color scheme, used by TurboWarp by default.',

src/components/tw-invalid-embed/invalid-embed.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/* this is an error, so we want it to stand out and always be readable regardless of what the site */
1212
/* embedding us looks like */
13-
background-color: #ff4c4c;
13+
background-color: #80A86A;
1414
color: white;
1515

1616
box-sizing: border-box;

src/lib/brand.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Legacy export format because this is used by some build-time scripts stuck in the past.
22
// eslint-disable-next-line import/no-commonjs
33
module.exports = {
4-
APP_NAME: 'TurboWarp'
4+
APP_NAME: 'SIDEKICK'
55
};
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import projectData from './project-data';
2+
3+
/* eslint-disable import/no-unresolved */
4+
import overrideDefaultProject from '!arraybuffer-loader!./override-default-project.sb3';
5+
import backdrop from '!raw-loader!./cd21514d0531fdffb22204e0ec5ed84a.svg';
6+
import costume1 from '!raw-loader!./dango-cat.svg';
7+
/* eslint-enable import/no-unresolved */
8+
import {TextEncoder} from '../tw-text-encoder';
9+
10+
const defaultProject = translator => {
11+
if (overrideDefaultProject.byteLength > 0) {
12+
return [{
13+
id: 0,
14+
assetType: 'Project',
15+
dataFormat: 'JSON',
16+
data: overrideDefaultProject
17+
}];
18+
}
19+
20+
let _TextEncoder;
21+
if (typeof TextEncoder === 'undefined') {
22+
_TextEncoder = require('text-encoding').TextEncoder;
23+
} else {
24+
_TextEncoder = TextEncoder;
25+
}
26+
const encoder = new _TextEncoder();
27+
28+
const projectJson = projectData(translator);
29+
return [{
30+
id: 0,
31+
assetType: 'Project',
32+
dataFormat: 'JSON',
33+
data: JSON.stringify(projectJson)
34+
}, {
35+
id: 'cd21514d0531fdffb22204e0ec5ed84a',
36+
assetType: 'ImageVector',
37+
dataFormat: 'SVG',
38+
data: encoder.encode(backdrop)
39+
}, {
40+
id: '927d672925e7b99f7813735c484c6922',
41+
assetType: 'ImageVector',
42+
dataFormat: 'SVG',
43+
data: encoder.encode(costume1)
44+
}];
45+
};
46+
47+
export default defaultProject;

src/lib/default-project/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import projectData from './project-data';
33
/* eslint-disable import/no-unresolved */
44
import overrideDefaultProject from '!arraybuffer-loader!./override-default-project.sb3';
55
import backdrop from '!raw-loader!./cd21514d0531fdffb22204e0ec5ed84a.svg';
6-
import costume1 from '!raw-loader!./dango-cat.svg';
6+
import costume1 from '!raw-loader!./sidekick.svg';
77
/* eslint-enable import/no-unresolved */
88
import {TextEncoder} from '../tw-text-encoder';
99

src/lib/default-project/sidekick.svg

Lines changed: 177 additions & 0 deletions
Loading

src/lib/themes/accent/green.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
const guiColors = {
2+
'motion-primary': '#80A86A',
3+
'motion-primary-transparent': '#80A86Ae6',
4+
'motion-tertiary': '#4d8f51',
5+
6+
'looks-secondary': '#80A86A',
7+
'looks-transparent': '#80A96B59',
8+
'looks-light-transparent': '#80A96B26',
9+
'looks-secondary-dark': 'hsla(147, 50%, 44%, 1)',
10+
11+
'extensions-primary': 'hsla(109, 11%, 54%, 1)',
12+
'extensions-tertiary': 'hsla(109, 11%, 29%, 1)',
13+
'extensions-transparent': 'hsla(109, 11%, 54%, 0.35)',
14+
'extensions-light': 'hsla(109, 11%, 74%, 1)',
15+
16+
'drop-highlight': '#80E8AA'
17+
};
18+
19+
const blockColors = {
20+
checkboxActiveBackground: '#80A86A',
21+
checkboxActiveBorder: '#4d8f51'
22+
};
23+
24+
export {
25+
guiColors,
26+
blockColors
27+
};

src/lib/themes/accent/rainbow.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
const guiColors = {
2-
'motion-primary': '#ff4c4c',
3-
'motion-primary-transparent': '#ff4c4ce6',
4-
'motion-tertiary': '#cc3333',
2+
'motion-primary': '#80A86A',
3+
'motion-primary-transparent': '#80A86Ae6',
4+
'motion-tertiary': '#4d8f51',
55

6-
'looks-secondary': '#ff4c4c',
7-
'looks-transparent': '#ff4d4d59',
8-
'looks-light-transparent': '#ff4d4d26',
9-
'looks-secondary-dark': 'hsla(0, 42%, 51%, 1)',
6+
'looks-secondary': '#80A86A',
7+
'looks-transparent': '#80A96B59',
8+
'looks-light-transparent': '#80A96B26',
9+
'looks-secondary-dark': 'hsla(147, 50%, 44%, 1)',
1010

11-
'extensions-primary': 'hsla(10, 85%, 65%, 1)',
12-
'extensions-tertiary': 'hsla(10, 85%, 40%, 1)',
13-
'extensions-transparent': 'hsla(10, 85%, 65%, 0.35)',
14-
'extensions-light': 'hsla(10, 57%, 85%, 1)',
11+
'extensions-primary': 'hsla(109, 11%, 54%, 1)',
12+
'extensions-tertiary': 'hsla(109, 11%, 29%, 1)',
13+
'extensions-transparent': 'hsla(109, 11%, 54%, 0.35)',
14+
'extensions-light': 'hsla(109, 11%, 74%, 1)',
1515

16-
'drop-highlight': '#ff8c8c',
16+
'drop-highlight': '#80E8AA',
1717

1818
'menu-bar-background-image': 'linear-gradient(90deg, rgba(255, 0, 0, 0.75) 0%, rgba(255, 154, 0, 0.75) 10%, rgba(208, 222, 33, 0.75) 20%, rgba(79, 220, 74, 0.75) 30%, rgba(63, 218, 216, 0.75) 40%, rgba(47, 201, 226, 0.75) 50%, rgba(28, 127, 238, 0.75) 60%, rgba(95, 21, 242, 0.75) 70%, rgba(186, 12, 248, 0.75) 80%, rgba(251, 7, 217, 0.75) 90%, rgba(255, 0, 0, 0.75) 100%)'
1919
};
2020

2121
const blockColors = {
22-
checkboxActiveBackground: '#ff4c4c',
23-
checkboxActiveBorder: '#cc3333'
22+
checkboxActiveBackground: '#80A86A',
23+
checkboxActiveBorder: '#4d8f51'
2424
};
2525

2626
export {

src/lib/themes/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import defaultsDeep from 'lodash.defaultsdeep';
33
import * as accentPurple from './accent/purple';
44
import * as accentBlue from './accent/blue';
55
import * as accentRed from './accent/red';
6+
import * as accentGreen from './accent/green';
67
import * as accentRainbow from './accent/rainbow';
78

89
import * as guiLight from './gui/light';
@@ -15,14 +16,16 @@ import * as blocksDark from './blocks/dark';
1516
const ACCENT_PURPLE = 'purple';
1617
const ACCENT_BLUE = 'blue';
1718
const ACCENT_RED = 'red';
19+
const ACCENT_GREEN = 'green';
1820
const ACCENT_RAINBOW = 'rainbow';
1921
const ACCENT_MAP = {
2022
[ACCENT_PURPLE]: accentPurple,
2123
[ACCENT_BLUE]: accentBlue,
2224
[ACCENT_RED]: accentRed,
25+
[ACCENT_GREEN]: accentGreen,
2326
[ACCENT_RAINBOW]: accentRainbow
2427
};
25-
const ACCENT_DEFAULT = ACCENT_RED;
28+
const ACCENT_DEFAULT = ACCENT_GREEN;
2629

2730
const GUI_LIGHT = 'light';
2831
const GUI_DARK = 'dark';
@@ -146,6 +149,7 @@ export {
146149
Theme,
147150
defaultBlockColors,
148151

152+
ACCENT_GREEN,
149153
ACCENT_RED,
150154
ACCENT_PURPLE,
151155
ACCENT_BLUE,

src/lib/tw-translations/generated-translations.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@
294294
"tw.accent.purple": "Lila",
295295
"tw.accent.rainbow": "Regenbogen",
296296
"tw.accent.red": "Rot",
297+
"tw.accent.green": "Grün",
297298
"tw.alerts.creatingRestorePoint": "Wiederherstellungspunkt wird erstellt...",
298299
"tw.alerts.lostPeripheralConnection": "Verbindung zu {extensionName} verloren.",
299300
"tw.alerts.restorePointError": "Der Wiederherstellpunkt konnte nicht erstellt werden",

0 commit comments

Comments
 (0)