Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

logging-scratch-gui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

1446abd8

Commit 1446abd8 authored 7 years ago by Josiah Neuberger

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into add-full-screen-render-view

parents 1e2240fa 3d280b5e

Branches

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

package.json 10 additions, 10 deletions

package.json
src/components/gui/gui.css 3 additions, 0 deletions

src/components/gui/gui.css
src/components/gui/gui.jsx 2 additions, 2 deletions

src/components/gui/gui.jsx
src/components/library/library.jsx 1 addition, 4 deletions

src/components/library/library.jsx
src/components/modal/modal.jsx 2 additions, 3 deletions

src/components/modal/modal.jsx
src/components/prompt/prompt.jsx 0 additions, 1 deletion

src/components/prompt/prompt.jsx
src/components/record-modal/record-modal.jsx 0 additions, 1 deletion

src/components/record-modal/record-modal.jsx
src/components/target-pane/target-pane.jsx 31 additions, 27 deletions

src/components/target-pane/target-pane.jsx
src/containers/backdrop-library.jsx 0 additions, 2 deletions

src/containers/backdrop-library.jsx
src/containers/costume-library.jsx 0 additions, 2 deletions

src/containers/costume-library.jsx
src/containers/record-modal.jsx 0 additions, 1 deletion

src/containers/record-modal.jsx
src/containers/sound-library.jsx 2 additions, 5 deletions

src/containers/sound-library.jsx
src/containers/sound-tab.jsx 1 addition, 1 deletion

src/containers/sound-tab.jsx
src/containers/sprite-library.jsx 2 additions, 4 deletions

src/containers/sprite-library.jsx
src/lib/blocks.js 19 additions, 6 deletions

src/lib/blocks.js

with 73 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment