aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-02-08 14:41:56 -0800
committerEric Guzman2012-02-08 14:41:56 -0800
commit637db74743ac1397ade7edec3da3ae1c1cdaa82a (patch)
treebc16578a5368098956d39f16ddd48737a9bb355c
parent40622aa97d31837254996b718b0a6feca2bcd0ce (diff)
parentab12be4e9a0d9fee4450795077b0107983b5682e (diff)
downloadninja-637db74743ac1397ade7edec3da3ae1c1cdaa82a.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scsscbin21915 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scsscbin3789 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc437
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MenuUI.scsscbin6504 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_PanelUI.scssc1684
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_ScrollBars.scsscbin14694 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Stage.scsscbin9187 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Tools.scssc641
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_UserContent.scsscbin2605 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_mixins.scsscbin3151 -> 0 bytes
-rw-r--r--_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_toolbar.scsscbin24407 -> 0 bytes
-rw-r--r--_scss/.sass-cache/97baea7acfdca1b9c2b38d8205ee9c08f4ce2eeb/ninja.scsscbin4378 -> 0 bytes
-rw-r--r--_scss/.sass-cache/b4d6d1ec9e05907b1ecca35fe36ff2a7343d4fd9/_colors.scsscbin17501 -> 0 bytes
-rw-r--r--_scss/.sass-cache/b4d6d1ec9e05907b1ecca35fe36ff2a7343d4fd9/_fonts.scsscbin7110 -> 0 bytes
-rw-r--r--_scss/.sass-cache/b4d6d1ec9e05907b1ecca35fe36ff2a7343d4fd9/_mixins.scsscbin4978 -> 0 bytes
-rw-r--r--js/components/combobox.reel/combobox.js91
-rw-r--r--js/components/tools-properties/fill-properties.reel/fill-properties.html11
-rw-r--r--js/components/tools-properties/fill-properties.reel/fill-properties.js6
-rw-r--r--js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html12
-rw-r--r--js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js6
-rw-r--r--js/components/tools-properties/line-properties.reel/line-properties.js14
-rw-r--r--js/components/tools-properties/oval-properties.reel/oval-properties.js14
-rw-r--r--js/components/tools-properties/rect-properties.reel/rect-properties.js14
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.css6
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.html35
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.js36
-rw-r--r--js/components/tools-properties/tag-properties.reel/tag-properties.html6
-rw-r--r--js/components/treeview/branch.reel/branch.css6
-rw-r--r--js/components/treeview/branch.reel/branch.html5
-rw-r--r--js/components/treeview/leaf.reel/leaf.css6
-rw-r--r--js/components/treeview/leaf.reel/leaf.html5
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.css6
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html5
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.css6
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html5
-rw-r--r--js/components/treeview/treeview.reel/treeview.css8
-rw-r--r--js/components/treeview/treeview.reel/treeview.html5
-rw-r--r--js/controllers/elements/shapes-controller.js100
-rw-r--r--js/data/pi/pi-data.js48
-rw-r--r--js/helper-classes/RDGE/GLCircle.js79
-rw-r--r--js/helper-classes/RDGE/GLGeomObj.js51
-rw-r--r--js/helper-classes/RDGE/GLLine.js27
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js65
-rw-r--r--js/helper-classes/RDGE/GLWorld.js2
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js2
-rw-r--r--js/mediators/drag-drop-mediator.js2
-rw-r--r--js/mediators/element-mediator.js7
-rw-r--r--js/models/shape-model.js3
-rw-r--r--js/panels/properties/sections/custom.reel/custom.js14
-rwxr-xr-xjs/preloader/Preloader.js1
-rw-r--r--js/tools/LineTool.js8
-rw-r--r--js/tools/OvalTool.js15
-rw-r--r--js/tools/RectTool.js15
-rw-r--r--js/tools/TagTool.js12
-rwxr-xr-xnode_modules/montage/core/event/binding.js4
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js4
-rwxr-xr-xnode_modules/montage/core/promise.js11
-rwxr-xr-xnode_modules/montage/ui/component.js48
-rw-r--r--node_modules/montage/ui/composer/composer.js14
-rw-r--r--node_modules/montage/ui/composer/swipe-composer.js24
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js5
-rwxr-xr-xscss/config.rb (renamed from _scss/config.rb)0
-rw-r--r--scss/imports/codemirror/_codemirror.scss (renamed from _scss/imports/codemirror/_codemirror.scss)0
-rw-r--r--scss/imports/codemirror/_css.scss (renamed from _scss/imports/codemirror/_css.scss)0
-rw-r--r--scss/imports/codemirror/_javascript.scss (renamed from _scss/imports/codemirror/_javascript.scss)0
-rw-r--r--scss/imports/scss/_Base.scss (renamed from _scss/imports/scss/_Base.scss)0
-rw-r--r--scss/imports/scss/_Components.scss (renamed from _scss/imports/scss/_Components.scss)0
-rw-r--r--scss/imports/scss/_MainWindow.scss (renamed from _scss/imports/scss/_MainWindow.scss)0
-rw-r--r--scss/imports/scss/_MenuUI.scss (renamed from _scss/imports/scss/_MenuUI.scss)0
-rw-r--r--scss/imports/scss/_PanelUI.scss (renamed from _scss/imports/scss/_PanelUI.scss)0
-rw-r--r--scss/imports/scss/_ScrollBars.scss (renamed from _scss/imports/scss/_ScrollBars.scss)0
-rw-r--r--scss/imports/scss/_Stage.scss (renamed from _scss/imports/scss/_Stage.scss)0
-rw-r--r--scss/imports/scss/_Tools.scss (renamed from _scss/imports/scss/_Tools.scss)0
-rw-r--r--scss/imports/scss/_ToolsSample.scss (renamed from _scss/imports/scss/_ToolsSample.scss)0
-rw-r--r--scss/imports/scss/_UserContent.scss (renamed from _scss/imports/scss/_UserContent.scss)0
-rw-r--r--scss/imports/scss/_mixins.scss (renamed from _scss/imports/scss/_mixins.scss)0
-rw-r--r--scss/imports/scss/_toolbar.scss (renamed from _scss/imports/scss/_toolbar.scss)0
-rw-r--r--scss/imports/themes/_test.scss (renamed from _scss/imports/themes/_test.scss)0
-rw-r--r--scss/imports/themes/default/_colors.scss (renamed from _scss/imports/themes/default/_colors.scss)0
-rw-r--r--scss/imports/themes/default/_fonts.scss (renamed from _scss/imports/themes/default/_fonts.scss)0
-rw-r--r--scss/imports/themes/default/_mixins.scss (renamed from _scss/imports/themes/default/_mixins.scss)0
-rwxr-xr-xscss/ninja.scss (renamed from _scss/ninja.scss)1
82 files changed, 599 insertions, 3033 deletions
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc
deleted file mode 100644
index 49f58b5a..00000000
--- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc
+++ /dev/null
Binary files differ
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc
deleted file mode 100644
index 38415553..00000000
--- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc
+++ /dev/null
Binary files differ
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc
deleted file mode 100644
index d9a82daa..00000000
--- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc
+++ /dev/null
@@ -1,437 +0,0 @@
13.0.24 (Classy Cassidy)
2962a1ab0ef1e7d35ecb9743bbd47fbbf3b79de41
3o:Sass::Tree::RootNode
4:
5@linei: @options{:
6style: expanded:load_paths[ "./public/stylesheets/sass",/Users/rmwh84/Sites/Ninja/MainApp/_scss"o/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/blueprint/stylesheets"~/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_blueprint_deprecated_imports/stylesheets"m/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/compass/stylesheets"|/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_compass_deprecated_imports/stylesheets"l/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-960-plugin-0.10.0/lib/../stylesheets"j/Applications/compass.app/Contents/Resources/ruby/gem/gems/html5-boilerplate-0.2.6/lib/../stylesheets:
7cacheT:cache_location"8/Users/rmwh84/Sites/Ninja/MainApp/_scss/.sass-cache: syntax: scss:full_exceptionT:css_location"./public/stylesheets:always_updateF:always_checkT:line_commentsT:template_location[ [@@[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@
8"3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@"3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@"3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css: filename"J/Users/rmwh84/Sites/Ninja/MainApp/_scss/imports/scss/_MainWindow.scss:property_syntax0:@template"1G/* <copyright>
9 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
10 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
11 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
12 </copyright> */
13
14/*
15 * MainWindow.scss
16 * Styles governing the main window and overall layout of the application.
17 * Note that colors and font definitions go in
18 * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
19 */
20
21 body {
22 position: absolute;
23 margin: 0px;
24 width: 100%;
25 height:100%;
26 background-color:$color-app-bg;
27 overflow: hidden;
28 -webkit-user-select:none;
29 font-family: 'DroidSans';
30}
31
32#appContainer {
33 position: absolute;
34 margin: 0px;
35 display: -webkit-box;
36 -webkit-box-orient: vertical;
37 -webkit-box-align: stretch;
38 width: 100%;
39 height: 100%;
40 border-left: 16px solid #000;
41 border-right: 16px solid #000;
42 border-top: 28px solid #000;
43 -webkit-box-sizing: border-box;
44 max-width:100%;
45 max-height:100%;
46}
47
48#appContainer > section {
49 display: -webkit-box;
50 -webkit-box-flex:0;
51}
52
53#appContainer #appWorkspace {
54 -webkit-box-flex:1;
55 -webkit-box-align: stretch;
56}
57
58#appWorkspace {
59 display: -webkit-box;
60 -webkit-box-orient: horizontal;
61 -webkit-box-pack: center;
62 -webkit-box-align: center;
63 -webkit-box-sizing: stretch;
64 position:relative;
65 padding:2px 0px;
66 border: 1px solid #333;
67