Commit graph

366 commits

Author SHA1 Message Date
Matthew Taylor
e384c07e3d fix linting, tests 2017-11-08 10:13:17 -05:00
Matthew Taylor
533e007ac9 pin react-responsive type
thanks @rschamp!
2017-11-08 09:55:44 -05:00
Matthew Taylor
018f9b28a6 add min width layout for tablet 2017-11-07 14:08:26 -05:00
Matthew Taylor
250e3ea089 fix validation 2017-11-07 14:04:54 -05:00
Matthew Taylor
95099d6e90 move modes to lib 2017-11-07 14:02:39 -05:00
DD Liu
13693e7fc0
Merge pull request #190 from fsih/NaNaNaNaNaNaNaNaN
Indicate gradients as mixed for now
2017-11-07 11:29:08 -05:00
DD Liu
9f2dd1dcf0
Merge pull request #184 from fsih/activeTools
Tools keep track of when they are 'active' (the mouse is down)
2017-11-07 11:18:09 -05:00
DD
5e1fcc66ea Tools keep track of when they are 'active' (mouse down has occured on them)' 2017-11-07 11:17:11 -05:00
DD Liu
078ab56583
Merge pull request #187 from fsih/fixCanvasDep
Fix canvas dep
2017-11-07 10:39:32 -05:00
DD
88a6b6e14e revert eslint change 2017-11-07 10:31:28 -05:00
DD
ff554fabd4 Indicate gradients as mixed for now 2017-11-06 15:06:05 -05:00
DD
479cdb5671 Attempt to fix canvas dep 2017-11-06 11:58:42 -05:00
DD Liu
46ff0bd3e1
Merge pull request #180 from fsih/modeGuard
Fix null mode issue
2017-11-06 10:17:33 -05:00
Matthew Taylor
88b2d3bf8f remove space
apologies – this happened during the manual merge.
2017-11-06 09:07:18 -05:00
Matthew Taylor
8697922d3b Merge branch 'issue/gh-122' into develop
* issue/gh-122:
  check min too
  Validate max value in live input
  create liveinput hoc instead
  change size inputs to input with custon onChange

# Conflicts:
#	src/components/mode-tools/mode-tools.jsx
2017-11-06 08:11:48 -05:00
DD
3c5ba7a08c Fix null mode issue 2017-11-03 18:11:48 -04:00
Matthew Taylor
e39b4edce1 check min too 2017-11-03 12:49:34 -04:00
DD Liu
5c9ab404cd
Merge pull request #177 from fsih/layerMixing
Try to make layer management more robust
2017-11-03 11:07:33 -04:00
Matthew Taylor
9eb3b7af39 Validate max value in live input
Also snap to max if the value is larger. Thanks @fsih!
2017-11-02 22:15:25 -04:00
DD
a9b55b9a22 Try to make layer management more robust 2017-11-02 17:19:42 -04:00
DD Liu
ffa4721e49
Merge pull request #118 from fsih/eraserDonuts
Fix erasing with holes
2017-11-02 14:27:49 -04:00
DD Liu
5626f72e85
Merge pull request #176 from fsih/copyPasteFunction
Add copy/paste functionality
2017-11-02 10:19:44 -04:00
DD
a5a60b0884 Offset the pasted item from the original when on the same costume 2017-11-01 18:10:03 -04:00
DD
cc920e8969 clear more of the state when you switch costumes. you shouldnt retain the same selected items 2017-11-01 17:23:20 -04:00
DD
7e1e8d96ac add copy/paste 2017-11-01 17:05:37 -04:00
Matthew Taylor
d2952c2114 create liveinput hoc instead
this should solve the issue of being able to delete what you typed. Thanks!
2017-11-01 15:57:31 -04:00
DD Liu
80a58bb90f
Merge pull request #173 from fsih/copyPaste
Move copy/paste to mode tools
2017-11-01 15:12:02 -04:00
Matthew Taylor
7dbabf60a9 change size inputs to input with custon onChange
This fixes #122 by reverting the changes to `bufferedInputHOC`, and adding a custom `onChange` handler to the mode tools for brush and eraser, and making them `Input` components. Same goes for the strok width indicator.
2017-11-01 13:41:36 -04:00
DD
1a654a22ed Move copy/paste to mode tools 2017-11-01 11:15:13 -04:00
Matthew Taylor
693f38d378
Merge pull request #171 from mewtaylor/issue/gh-134
Towards GH-134: Add disabled copy/paste buttons
2017-10-31 16:42:22 -04:00
Matthew Taylor
65b59f6e0a fix typo
thanks @fsih!
2017-10-31 16:32:37 -04:00
Matthew Taylor
f2e031e787 make alt optional for labeled buttons
Also add labels to `defineMessages` for localization. Thanks @fsih!
2017-10-31 15:03:51 -04:00
Matthew Taylor
858a4fbef3 Add disabled copy/paste buttons
This is for #134 – adds copy/paste buttons to the second row of tools, and keeps them in a disabled state for now, while they’re not usable. It also moves icons into a subfolder, given their proliferation in the paint editor component
2017-10-31 13:45:09 -04:00
DD Liu
28b9c4149e
Merge pull request #169 from fsih/shapeColor
Force a color state when switching to shape tools
2017-10-31 10:27:59 -04:00
DD Liu
a35253c5e8
Merge pull request #168 from fsih/removePen
Remove pen
2017-10-31 10:24:29 -04:00
Matthew Taylor
949947c215
Merge pull request #170 from mewtaylor/issue/gh-131
Fix GH-131: Add a larger width on small inputs
2017-10-31 10:22:03 -04:00
Matthew Taylor
040baf5b82 Add a larger width on small inputs
Fixes #131 – I ended up deciding to do this for all inputs because the original `3rem` makes it cut off text past 1 char for any input that is only `3rem`, so `3.5rem` seemed like an okay width for this component.
2017-10-31 08:26:52 -04:00
DD
0d0cdfa757 Force a color state when switching to shape tools 2017-10-30 18:23:41 -04:00
DD
81191ff7f9 remove pen 2017-10-30 17:49:44 -04:00
Paul Kaplan
3becde590d
Merge pull request #159 from paulkaplan/aggregate-color-updates
Only submit SVG changes when color picker closes
2017-10-30 11:16:50 -04:00
Paul Kaplan
1f6f7b2405
Merge pull request #158 from paulkaplan/hide-box-on-mixed
Only show outline box if not mixed colors
2017-10-30 11:16:24 -04:00
Paul Kaplan
3dab6ef7f0 Fix nits 2017-10-30 11:13:29 -04:00
Paul Kaplan
a7c3566fe8
Merge pull request #163 from paulkaplan/fix-outline-box-position
Make outline box in color button centered
2017-10-30 11:09:07 -04:00
Paul Kaplan
8fdab88996
Merge pull request #160 from paulkaplan/fix-slider-ranges
Make color sliders go from 0 to 100
2017-10-30 11:09:00 -04:00
Paul Kaplan
c4da530240 Make outline box in color button centered 2017-10-30 09:52:49 -04:00
Paul Kaplan
02996af315
Merge pull request #157 from paulkaplan/fix-zoom-buttons
Swap zoom in and out buttons
2017-10-30 08:53:43 -04:00
Paul Kaplan
b78b99b3a9 Make color sliders go from 0 to 100 2017-10-29 14:51:25 -04:00
Paul Kaplan
7cc3ecf74b Only submit SVG changes when color picker closes 2017-10-29 14:10:43 -04:00
Paul Kaplan
c43d510860 Swap zoom in and out buttons 2017-10-29 13:36:53 -04:00
DD
c41c31ac3e fix comment 2017-10-27 13:35:28 -04:00