Skip to content

Commit 943d061

Browse files
committed
Remove the character from the program editor
1 parent 934e151 commit 943d061

3 files changed

Lines changed: 4 additions & 66 deletions

File tree

src/ProgramBlockEditor.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import ProgramSequence from './ProgramSequence';
1919
import ToggleSwitch from './ToggleSwitch';
2020
import { ReactComponent as AddIcon } from './svg/Add.svg';
2121
import { ReactComponent as DeleteAllIcon } from './svg/DeleteAll.svg';
22-
import { getWorldCharacter } from './Worlds';
2322
import './ProgramBlockEditor.scss';
2423

2524
// TODO: Send focus to Delete toggle button on close of Delete All confirmation
@@ -754,8 +753,6 @@ export class ProgramBlockEditor extends React.Component<ProgramBlockEditorProps,
754753
const contents = this.renderProgramSections();
755754
contents.push(this.makeEndOfProgramAddNodeSection(this.props.programSequence.getProgramLength()));
756755

757-
const character = getWorldCharacter(this.props.theme, this.props.world);
758-
759756
return (
760757
<div className='ProgramBlockEditor__container'>
761758
<div className='ProgramBlockEditor__header'>
@@ -788,18 +785,6 @@ export class ProgramBlockEditor extends React.Component<ProgramBlockEditorProps,
788785
</span>
789786
</div>
790787
</div>
791-
<div className='ProgramBlockEditor__character-column'>
792-
<div
793-
aria-hidden='true'
794-
className={`ProgramBlockEditor__character-column-character-container
795-
ProgramBlockEditor__character-column-character-container--${this.props.world}`}
796-
role='img'>
797-
{React.createElement(
798-
character,
799-
{ className: 'ProgramBlockEditor__character-column-character' }
800-
)}
801-
</div>
802-
</div>
803788
<div
804789
className={'ProgramBlockEditor__program-sequence-scroll-container' + (!this.props.editingDisabled && this.props.isDraggingCommand ? ' ProgramBlockEditor__program-sequence-scroll-container--isDragging': '') }
805790
ref={this.programSequenceContainerRef}

src/ProgramBlockEditor.scss

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
border-radius: 3px;
1313
display: grid;
1414
height: 100%;
15-
grid-template-columns: 3rem auto;
15+
grid-template-columns: auto;
1616
grid-template-rows: min-content auto;
1717
}
1818

1919
.ProgramBlockEditor__header {
2020
background-color: #CCE6E2;
2121
display: grid;
2222
grid-column-start: 1;
23-
grid-column-end: 3;
23+
grid-column-end: 2;
2424
grid-row-start: 1;
2525
grid-row-end: 2;
2626
grid-template-columns: auto auto;
@@ -95,37 +95,12 @@
9595
height: 1.4rem;
9696
}
9797

98-
.ProgramBlockEditor__character-column {
99-
align-items: center;
100-
background-color: #30444E;
101-
border-right: 1px solid #19282F;
102-
border-radius: 3px 0 0 3px;
103-
box-shadow: 2px 0px 1px #8F8F8F;
104-
display: flex;
105-
justify-content: center;
106-
padding: 0 0.5rem;
107-
}
108-
109-
.ProgramBlockEditor__character-column-character-container {
110-
box-sizing: border-box;
111-
height: 45px;
112-
width: 45px;
113-
border-radius: 4px;
114-
border: 2px solid #22343C;
115-
}
116-
117-
.ProgramBlockEditor__character-column-character {
118-
width: 2.5rem;
119-
height: 2.5rem;
120-
padding: 0.4rem;
121-
}
122-
12398
.ProgramBlockEditor__program-sequence-scroll-container {
12499
border-radius: 0 3px 3px 0px;
125100
display: grid;
126101
grid-template-rows: auto 9rem auto;
127-
grid-column-start: 2;
128-
grid-column-end: 3;
102+
grid-column-start: 1;
103+
grid-column-end: 2;
129104
grid-row-start: 2;
130105
grid-row-end: 3;
131106
background: #FFF;

src/Themes.scss

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,6 @@ body.light-theme {
266266
color: #1E1E1E;
267267
}
268268

269-
.ProgramBlockEditor__character-column {
270-
background-color: #EBFAF8;
271-
border-right: 2px solid #D3E7EC;
272-
}
273-
274-
.ProgramBlockEditor__character-column-character-container {
275-
border: 2px solid #818A98;
276-
}
277-
278269
.ProgramBlockEditor__program-sequence-scroll-container {
279270
background-color: white;
280271
}
@@ -710,10 +701,6 @@ body.dark-theme {
710701
border: 2px solid #33717F;
711702
}
712703

713-
.ProgramBlockEditor__character-column {
714-
background-color: #30444E;
715-
}
716-
717704
.ProgramBlockEditor__header {
718705
background-color: #30444E;
719706
color: #EBFAF8;
@@ -1381,10 +1368,6 @@ body.gray-theme {
13811368
background-color: #D5D8DD;
13821369
}
13831370

1384-
.ProgramBlockEditor__character-column {
1385-
background-color: #F1F2F4;
1386-
}
1387-
13881371
.ProgramBlockEditor__program-sequence-scroll-container {
13891372
background-color: white;
13901373
margin-left: 0.1rem;
@@ -2483,11 +2466,6 @@ body.contrast-theme {
24832466
}
24842467
}
24852468

2486-
.ProgramBlockEditor__character-column {
2487-
background-color: black;
2488-
border-right: 2px solid #9DA4AF;
2489-
}
2490-
24912469
.ProgramBlockEditor__program-sequence-scroll-container {
24922470
background-color: black;
24932471
}

0 commit comments

Comments
 (0)