aboutsummaryrefslogtreecommitdiff
path: root/scss
Commit message (Collapse)AuthorAge
* 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>
* Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
|\ | | | | Resizers refactoring
| * Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | fully removing our old button component from NinjaValerio Virgillito2012-03-19
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Disabled State is now darkerArmen Kesablyan2012-03-08
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Disabled state for panelsArmen Kesablyan2012-03-07
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixing the right panel disappearing when collapsed and re-enabledValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the selection tool properties icons.Valerio Virgillito2012-02-23
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removed Sass CacheArmen Kesablyan2012-02-22
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Removed Sass CacheArmen Kesablyan2012-02-22
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
|\
| * fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Fixed the stage scroll by hiding the rulers.Valerio Virgillito2012-02-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 302ae3c1812086d976eb67c9cf693c43205f3904 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 11:13:05 2012 -0800 hide the rulers when no document is open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 06:43:33 2012 -0800 file picker: Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 16:09:14 2012 -0800 fixes to document tabbing Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:38 2012 -0800 Revert "Revert "Creating NinjaTemplate to HTML function"" This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:14 2012 -0800 Revert "Revert "Reverting text/html document classes and setting up MVC folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit aead95ce4b2571356701229567bfde73d54bed93 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:53:55 2012 -0800 Revert "Revert "Cleaning up"" This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:56 2012 -0800 Revert "Revert "Merging TextDocument into BaseDocument"" This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e864dc319805e259b7ae39a9d4d96fac552a1f87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:38 2012 -0800 Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:06:42 2012 -0800 merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit b8782f2e3dd106accbb0160a98e6b498f26752ea Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:01:59 2012 -0800 Revert "Merging TextDocument into BaseDocument" This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:58:37 2012 -0800 Revert "Cleaning up" This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 9048cd50bf5e0a418d1d95498bb593961f72db36 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:51:12 2012 -0800 Revert "Reverting text/html document classes and setting up MVC folder structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e308be9bec5e06d81b2905b65005a232f0a190d Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:50:20 2012 -0800 Revert "Creating NinjaTemplate to HTML function" This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | |\ | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| | | * Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
| | | |\ | | | | | | | | | | | | | | | integration
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:29:40 +0000