aboutsummaryrefslogtreecommitdiff
path: root/scss
Commit message (Collapse)AuthorAge
* menu design update and bug fixes - Moved Preview to the document barValerio Virgillito2012-07-17
| | | | | | | | | | | | - Redesigned the menu and improved DOM structure. - Removed un-used entires - Fixed layout and snap entries - Moved the preview button to the document bar. - Fixes for bugs: #1750, #1867, #1876, #1895 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Added back one copyright block so it is properly included in the ninja.css ↵John Mayhew2012-07-16
| | | | output file from SASS
* Fixed incorrect comment blocks around our open source copyright notice. ↵John Mayhew2012-07-16
| | | | These incorrect comments kept us from being able to create the ninja.css file via SASS
* BSD LicenseKris Kowal2012-07-09
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge pull request #340 from mencio/panel-cleanup-scrollValerio Virgillito2012-06-26
|\ | | | | Panel cleanup scroll
| * removing un-necessary panel styles and possibly fix IKNINJA-1626Valerio Virgillito2012-06-26
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
|\| | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\
| * | 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 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\| | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | the iframeContainer now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Sped up user-interaction by moving grid drawing into its own canvas so the ↵Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | layout code doesn't have to be run when modifying selected elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Changes for binding ViewArmen Kesablyan2012-06-05
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\| | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | | | | | removed its use of the sprite sheet
| * -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | | | -implemented the new mode radio buttons for the pen tool
| * -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | | | | | | | | 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
| * -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | | | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| |\ | | | | | | | | | WorkingBranch
| * | -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
| * | 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
| | |
| * | 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
| * | | 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
* | | | Finished skeleton structure for binding.Armen Kesablyan2012-05-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
|\ \ \ \ | | |_|/ | |/| |
| * | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| | |/ | |/| | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Workspace: has customizedArmen Kesablyan2012-05-14
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-08
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| |/ | | | | | | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* / Initial Setup of the binding ToolArmen Kesablyan2012-05-07
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Bug #1060: Fixed CSS Lint issueArmen Kesablyan2012-03-30
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Resizing BugsArmen Kesablyan2012-03-29
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>