aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel
Commit message (Collapse)AuthorAge
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
|\ \ | |/ |/| | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Update copyright boilerplateKris Kowal2012-07-06
|/
* Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
|\
| * 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.
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
|\|
| * 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>
* | Initial Text Tool ChangesArmen Kesablyan2012-06-05
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | -simplified text options CSS -fixed styling to accommodate new images
* -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
|
* 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
| * Removing unused components referencesValerio 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>
* | 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
* fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixing the Text tool toggle buttonsValerio Virgillito2012-02-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
|\ | | | | | | integration
| * Fixed binding to font size dropdownArmen Kesablyan2012-02-13
| |
| * Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵Armen Kesablyan2012-02-13
| | | | | | | | and numbered now bound to text tool
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\| | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * More Text Tool UpdatesArmen Kesablyan2012-02-09
| |
| * Refactored rich text editor locationArmen Kesablyan2012-02-07
| |
| * Initial Text tool completion.Armen Kesablyan2012-02-07
| |
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 15:53:24 +0000