aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | * | | | fixed bug introduced when we removed the color toolbar. The styling of the ↵John Mayhew2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
| | | | | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| | | | | | | |\ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | WorkingBranch
| * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eve...
| | | * | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | | | | | | | | | | | |
| * | | | | | | | | | | | some code cleanupValerio Virgillito2012-05-09
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | / / / / / Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | * | | | 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 out old select tool image css classes into the proper css file.John 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
| | | | | | | * | | | updated ninja.css from sassJohn Mayhew2012-05-07
| | | | | | | | | | |
| | | | | | | * | | | 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.
* | | | | | | | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #240 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Automatically add scrollbars if any content is in negative space. Fixed selection bugs in banner templates.
| | * | | | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-16
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Inline style for html's padding for content in negative space to guarantee ↵Nivesh Rajbhandari2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | highest specificity. Also, set up scrollbars when opening files with content in negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-16
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Fixing selection bugs in new templates.Nivesh Rajbhandari2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |