aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/fill-properties.reel/fill-properties.html
Commit message (Collapse)AuthorAge
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
|\
| * updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
|/ | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
* Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
|
* -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
|
* implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | make all icons for fill and stroke use the proper classes/images
* 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
| * 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
* Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | preparation for montage converting to the new "prototype" format fully
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\
| * Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>