| Commit message (Collapse) | Author | Age |
| |
|
| |
|
| |
|
|\
| |
| | |
Panel cleanup scroll
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |\ |
|
| | |
| | |
| | |
| | | |
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.
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| |
| |
| | |
the iframeContainer now.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| | |
layout code doesn't have to be run when modifying selected elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| | |
removed its use of the sprite sheet
|
| |
| |
| |
| | |
-implemented the new mode radio buttons for the pen tool
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
-made tag and zoom tool radio group button styles consistent and removed duplicate classes
|
| |\
| | |
| | |
| | | |
WorkingBranch
|
| | |
| | |
| | |
| | |
| | | |
-finished styling shape tool options
-added new icons for shape tool
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
-Styled the selection tool options bar
|
| | | |
|
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\ \ \ \
| | |_|/
| |/| | |
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@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>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/
| |
| |
| |
| |
| | |
- cleaning up
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|/
|
|
| |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|
|
|
| |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|
|
|
| |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\
| |
| | |
Resizers refactoring
|
| |
| |
| |
| | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|/
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|