Paul Kaplan
d98a493954
Add initial transparent and mixed icons for color buttons and swatch
2017-10-26 17:43:06 -04:00
DD Liu
c67459da0a
Merge pull request #111 from fsih/brushColor2
...
Never mind, it was supposed to be looks purple
2017-10-26 16:42:11 -04:00
DD
7c8c9aa23d
change default color to looks purple
2017-10-26 16:41:01 -04:00
DD Liu
533893fa4e
Merge pull request #110 from fsih/brushColor
...
Change default fill color to motion blue
2017-10-26 16:32:56 -04:00
DD
ad28e1ff16
Change default fill color to motion blue
2017-10-26 15:58:02 -04:00
Matthew Taylor
162ca81ff9
comment out currently disabled imports
2017-10-26 15:48:20 -04:00
DD Liu
b2eb47d7f2
Merge pull request #107 from fsih/backspace
...
Don't delete when input field focused
2017-10-26 15:44:19 -04:00
Matthew Taylor
b7f0df5214
Merge branch 'issue/disabled-state' into develop
...
* issue/disabled-state:
comment out disabled mode tools for now
Change border on disabled undo/enabled redo
pass props to button from labeled button
Add undo/redo disabled states
Have the paint-editor container listen to `selectedItems`
Add bool to `disabled` prop type
Add disabled state for button
# Conflicts:
# src/containers/paint-editor.jsx
2017-10-26 15:32:43 -04:00
Matthew Taylor
0f726c9d40
comment out disabled mode tools for now
2017-10-26 14:20:39 -04:00
Matthew Taylor
cdb235a876
Change border on disabled undo/enabled redo
...
thanks @fsih
2017-10-26 14:03:09 -04:00
DD
6e589e8f81
case
2017-10-26 12:05:54 -04:00
DD
2019196256
Do onUpdateSvg only once on changing stroke width
2017-10-26 11:28:10 -04:00
DD
7ca851985e
Move delete out of tools so its always available
2017-10-26 11:25:38 -04:00
Matthew Taylor
9ef967aa24
pass props to button from labeled button
...
so that we don’t have to check for things like `disabled` twice.
2017-10-26 11:02:01 -04:00
Matthew Taylor
7b783a5c46
Add undo/redo disabled states
2017-10-26 10:58:28 -04:00
Matthew Taylor
2376a3ce63
Have the paint-editor container listen to selectedItems
...
This solves the issue of buttons not updating their disabled/enabled state until being dragged by making sure that a re-render occurs whenever a new item is selected, checking again for state.
2017-10-26 09:28:01 -04:00
Matthew Taylor
128f9ca642
Add bool to disabled prop type
...
fixes a warning that @paulkaplan noticed, thanks!
2017-10-26 09:26:54 -04:00
DD Liu
4e7a1fab40
Merge pull request #97 from fsih/crosshair
...
Add the background guide layer
2017-10-25 17:26:47 -04:00
DD
8fccfb3dc3
Use content-box so that we dont have edges around the border
2017-10-25 16:47:56 -04:00
Matthew Taylor
a38b1f6121
Add disabled state for button
...
This implements #47 by adding a disabled state to the button component, and then by applying it to top row buttons for group/ungroup, and front/back forward/backward.
2017-10-25 16:44:04 -04:00
Matthew Taylor
1459593b2b
Merge pull request #99 from mewtaylor/issue/gh-36
...
Implement GH-36 and GH-37: Add basic eraser and brush size picker
2017-10-25 15:49:36 -04:00
Matthew Taylor
c1862284ff
Remove unused reference
2017-10-25 15:23:30 -04:00
DD
67562c8799
Use a raster for the guid layer background
2017-10-25 14:47:40 -04:00
Matthew Taylor
117c24787a
remove unused reference
2017-10-25 14:36:08 -04:00
Matthew Taylor
e2fd966ae9
Increase max size to 1
2017-10-25 14:22:36 -04:00
Matthew Taylor
3574918f23
Add comment, and adjust handleChange()
...
make `e.target.value` the submitted thing, rather than `this.props.value`
2017-10-25 14:15:02 -04:00
Matthew Taylor
90c485ba23
remove half-baked slider stuff
...
whoops!
2017-10-25 13:51:57 -04:00
Matthew Taylor
ea36e10577
Add basic eraser and brush size picker
...
this implements the first version of #36 and #37 , in which the brush size picker is a numeric input field rather than a slider.
2017-10-25 13:37:41 -04:00
DD
29f5cc7216
fix undo snapshotting with the background guide layer
2017-10-24 17:37:55 -04:00
DD
29a3d74143
Add the background guide layer
2017-10-24 17:12:44 -04:00
Paul Kaplan
706a9c101d
Merge pull request #95 from paulkaplan/mode-order
...
Update default mode to select and mode button order
2017-10-24 16:29:52 -04:00
Paul Kaplan
4d0f3e8311
Update default mode in reducer
2017-10-24 15:52:39 -04:00
Paul Kaplan
4e9108e8e3
Update default mode order
2017-10-24 15:51:57 -04:00
Paul Kaplan
748bd44cbc
Merge pull request #92 from paulkaplan/update-color-language
...
Change "Hue" to "Color" in color picker
2017-10-24 15:01:14 -04:00
DD Liu
dacc17d6c4
Merge pull request #89 from fsih/group
...
Add group/ungroup
2017-10-24 13:50:07 -04:00
DD
251967fefb
fix merge
2017-10-24 13:27:09 -04:00
DD
a538d10992
Add comments to group code
2017-10-24 13:26:43 -04:00
DD
083bf63869
Add group and ungroup
2017-10-24 13:26:43 -04:00
Matthew Taylor
091201756b
Add UI formatting for edit fields
...
This adds formatting and icons to the edit field buttons at the top of the ui, as well as some additional components for abstraction – such as `InputGroup`, `ButtonGroup` and `EditFieldButton` (which is a subcomponent of the paint editor)
2017-10-24 13:25:44 -04:00
DD Liu
75a2f804cc
Merge pull request #91 from fsih/layerOrder
...
Layer order
2017-10-24 13:23:23 -04:00
Paul Kaplan
0bc3f12475
Change "Hue" to "Color" in color picker
2017-10-24 09:27:23 -04:00
Matthew Taylor
3fd72e775d
remove svg for now
...
fix lint error since this is not used while rotation point is not part of the ui
2017-10-23 17:27:08 -04:00
DD
3b4f509f89
Implement ordering buttons
2017-10-23 17:20:35 -04:00
Matthew Taylor
c3f578c140
Add UI formatting for edit fields
...
This adds formatting and icons to the edit field buttons at the top of the ui, as well as some additional components for abstraction – such as `InputGroup`, `ButtonGroup` and `EditFieldButton` (which is a subcomponent of the paint editor)
2017-10-23 17:19:44 -04:00
Matthew Taylor
1963d9d0db
Merge branch 'issue/edit-field-ui' of https://github.com/mewtaylor/scratch-paint into develop
...
* 'issue/edit-field-ui' of https://github.com/mewtaylor/scratch-paint :
Hide rotation point button for now
Add UI formatting for edit fields
# Conflicts:
# src/components/paint-editor/paint-editor.jsx
2017-10-23 17:08:56 -04:00
Matthew Taylor
f44bd4b7fd
Hide rotation point button for now
...
thanks @fsih!
2017-10-23 15:56:38 -04:00
Ray Schamp
82386c2c88
Merge pull request #78 from rschamp/costume-on-submit
...
Add props for name, onUpdateName, and svgId
2017-10-23 11:56:34 -04:00
DD Liu
1caf47a891
Merge pull request #86 from fsih/deleteShapes
...
Delete shapes
2017-10-23 11:27:03 -04:00
DD Liu
c2f561829e
Merge pull request #85 from fsih/ovalTool
...
Oval mode
2017-10-23 11:16:39 -04:00
Matthew Taylor
2fe9ac12a7
Add UI formatting for edit fields
...
This adds formatting and icons to the edit field buttons at the top of the ui, as well as some additional components for abstraction – such as `InputGroup`, `ButtonGroup` and `EditFieldButton` (which is a subcomponent of the paint editor)
2017-10-23 10:35:30 -04:00
