aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
Commit message (Collapse)AuthorAge
* removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
|\ | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| |\ | | | | | | Pentool
| | * Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | |\
| | * | More consistent local and global mouse coords which solves a bug with the ↵Pushkar Joshi2012-05-29
| | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths
| | * | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
* | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
|/ / | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Removed unneeded identifier.Nivesh Rajbhandari2012-05-17
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixed border radius hot-text linking that was broken by update to montage v.10.Nivesh Rajbhandari2012-05-17
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | -simplified text options CSS -fixed styling to accommodate new images
* updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | removed its use of the sprite sheet
* Add color to tag toolValerio Virgillito2012-05-15
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | -implemented the new mode radio buttons for the pen tool
* -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
* -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes
* put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
|
* removed unnecessary css classJohn Mayhew2012-05-10
|
* -moved sel tool images to proper folderJohn Mayhew2012-05-10
| | | | | -finished styling shape tool options -added new icons for shape tool
* -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
|
* Correct layout and styling for the shape tool and its sub toolsJohn Mayhew2012-05-09
|
* -Put new selection tool icons in the options barJohn Mayhew2012-05-09
| | | | -Styled the selection tool options bar
* implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | make all icons for fill and stroke use the proper classes/images
* removed unused classes form selection properties reelJohn Mayhew2012-05-08
|
* moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | | | added extra padding before first input control
* -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
* Removed unused SubSelect ToolJohn Mayhew2012-05-08
|
* Fixed missing quote from last mergeJohn Mayhew2012-05-07
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | more work on making subtool styling/layout consistentJohn Mayhew2012-05-07
| |
* | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* | First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
|/ | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | preparation for montage converting to the new "prototype" format fully
* Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
|\ | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
| * Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
|/ | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
* Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\ | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | PI for pen and brush strokesPushkar Joshi2012-03-14
| |
* | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
|/
* bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
* brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
|