Skip to content

Zoom controls #808

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
Merged
merged 6 commits into from
Feb 22, 2017
Merged

Zoom controls #808

merged 6 commits into from
Feb 22, 2017

Conversation

thisandagain
Copy link
Contributor

@thisandagain thisandagain commented Feb 21, 2017 •
edited
Loading

Resolves

GH-43

Proposed Changes

  • Makes trashcan hidden by default
  • Updates zoom controls as per Design - Zoom controls #43 and discussion with @carljbowman
  • Replaces use of sprites.png with individual SVG assets for each zoom control (easier to maintain)

@thisandagain thisandagain added this to the March 23 milestone Feb 21, 2017
@thisandagain thisandagain requested a review from rschamp February 21, 2017 21:49
@thisandagain thisandagain removed the request for review from rschamp February 21, 2017 21:57
@thisandagain thisandagain requested a review from rschamp February 21, 2017 22:17
@thisandagain
Copy link
Contributor Author

Note to self: squash during merge

rschamp
rschamp suggested changes Feb 22, 2017
View reviewed changes
Copy link
Contributor

@rschamp rschamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one syntax thing — tested it out in the GUI and the VM, looks/works great!

core/zoom_controls.js Outdated
* @type {string}
* @private
*/
Blockly.ZoomControls.prototype.ZOOM_RESET_PATH = 'zoom-reset.svg';

This comment was marked as abuse.

Sign in to view

@thisandagain
Copy link
Contributor Author

@rschamp Good catch. Fixed.

@rschamp rschamp assigned thisandagain and unassigned rschamp Feb 22, 2017
@thisandagain thisandagain merged commit 292296a into scratchfoundation:develop Feb 22, 2017
paulkaplan pushed a commit to paulkaplan/scratch-blocks that referenced this pull request May 5, 2017
@rachel-fenichel
Merge pull request scratchfoundation#808 from harbaum/master
efa976e 
Fix german translation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rschamp rschamp rschamp approved these changes

Assignees

@thisandagain thisandagain

Labels
pr - good to merge
Projects
None yet
Milestone
March 23
Development

Successfully merging this pull request may close these issues.
2 participants
@thisandagain @rschamp