| Commit message (Collapse) | Author | Age |
... | |
| | |
| | |
| | |
| | | |
-made tag and zoom tool radio group button styles consistent and removed duplicate classes
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
-finished styling shape tool options
-added new icons for shape tool
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
-Styled the selection tool options bar
|
| | |
| | |
| | |
| | | |
make all icons for fill and stroke use the proper classes/images
|
| | | |
|
| | |
| | |
| | |
| | | |
added extra padding before first input control
|
| | |
| | |
| | |
| | |
| | | |
-Separated the options3d CSS from the tag tool options css
-Removed unused translateObjectToolContainer CSS class
|
| | | |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/components/tools-properties/tag-properties.reel/tag-properties.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |/
| | |
| | |
| | |
| | |
| | | |
element models
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
| |
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.
|
|
|
|
| |
preparation for montage converting to the new "prototype" format fully
|
|\
| |
| | |
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.
|
| |
| |
| |
| |
| |
| | |
the ink bottle tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| | |
Conflicts:
js/controllers/elements/shapes-controller.js
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
|/ |
|
|
|
|
|
|
|
| |
AND
Laplacian smoothing for denoising
AND
code cleanup (removing blocks of commented code)
|
| |
|
|
|
|
|
|
|
| |
that's fully the color of the brush
AND
add a smoothing flag for the brush options
|
|
|
|
| |
size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
|
|
| |
version of Montage.
We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| | |
integration
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | | |
and numbered now bound to text tool
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
|
| |\|
| | |
| | |
| | | |
feature-branch
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
|
| | | | |
|
| | | | |
|
|\| | | |
|