Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Levelbuilder Level Page Clean Up: Blockly Editors, Callouts, Instructions #29126

Merged
merged 3 commits into from Jun 14, 2019
Merged

Levelbuilder Level Page Clean Up: Blockly Editors, Callouts, Instructions #29126

merged 3 commits into from Jun 14, 2019

Conversation

dmcavoy
Copy link
Contributor

@dmcavoy dmcavoy commented Jun 14, 2019 •
edited

This cleans up some editors that are used on several different level types.

  1. Block Editors - Used on most CSF style levels.
  2. Callouts - Used on most (maybe all) programming levels.
  3. Instructions - Used on all programming levels.

For the most part this just moves existing features inside collapsed areas but there were a couple things that were csf instructions specific that I moved to the instructions area after talking to Mike.

Blockly

Screen Shot 2019-06-14 at 1 46 07 PM

Callouts

Screen Shot 2019-06-14 at 1 46 15 PM

Instructions

Screen Shot 2019-06-14 at 1 45 49 PM

@dmcavoy dmcavoy changed the base branch from staging to levelbuilder-update-part-3 June 14, 2019 17:42
@dmcavoy dmcavoy changed the base branch from levelbuilder-update-part-3 to staging June 14, 2019 19:35
@dmcavoy dmcavoy merged commit 7ebf746 into staging Jun 14, 2019
@dmcavoy dmcavoy deleted the levelbuilder-update-part-4 branch June 14, 2019 19:36
islemaster added a commit that referenced this pull request Jun 17, 2019
@islemaster
Revert "Merge pull request #29126 from code-dot-org/levelbuilder-upda…
f74e1f7 
…te-part-4"

This reverts commit 7ebf746, reversing
changes made to 4ab3040.
@islemaster islemaster mentioned this pull request Jun 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidsbailey davidsbailey davidsbailey approved these changes

@maddiedierker maddiedierker Awaiting requested review from maddiedierker

Assignees
No one assigned
Labels
levelbuilder-improvements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dmcavoy @davidsbailey