Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into working

63 files changed, 315 insertions, 2852 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
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
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 @@
-3.0.24 (Classy Cassidy)
-962a1ab0ef1e7d35ecb9743bbd47fbbf3b79de41
-o:Sass::Tree::RootNode
-:
-@linei:
@options{:
-style:
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:
-cacheT: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[@
-"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>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-/*
- * MainWindow.scss
- * Styles governing the main window and overall layout of the application.
- * Note that colors and font definitions go in
- * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
- */
-
- body {
-    position: absolute;
-    margin: 0px;
-    width: 100%;
-    height:100%;
-    background-color:$color-app-bg;
-    overflow: hidden;
-    -webkit-user-select:none;
-    font-family: 'DroidSans';
-}
-
-#appContainer {
-    position: absolute;
-    margin: 0px;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-box-align: stretch;
-    width: 100%;
-    height: 100%;
-    border-left: 16px solid #000;
-    border-right: 16px solid #000;
-    border-top: 28px solid #000;
-    -webkit-box-sizing: border-box;
-    max-width:100%;
-    max-height:100%;
-}
-
-#appContainer > section {
-    display: -webkit-box;
-    -webkit-box-flex:0;
-}
-
-#appContainer #appWorkspace {
-    -webkit-box-flex:1;
-    -webkit-box-align: stretch;
-}
-
-#appWorkspace {
-    display: -webkit-box;
-    -webkit-box-orient: horizontal;
-    -webkit-box-pack: center;
-    -webkit-box-align: center;
-    -webkit-box-sizing: stretch;
-    position:relative;
-    padding:2px 0px;
-    border: 1px solid #333;
-    overflow: hidden;
-}
-
-#topMenu {
-    background-color: #474747;
-    position:absolute;
-    height:28px;
-    width:100%;
-    top:0px;
-    left:0px;
-    z-index: 8999;
-}
-
-#topPanelContainer,
-#leftPanelContainer,
-#rightPanelContainer,
-#bottomPanelContainer {
-    background-color: #282828;
-}
-#topPanelContainer {
-    overflow: hidden;
-    margin-bottom:2px;
-    height:32px;
-}
-
-#bottomPanelContainer {
-    /*border: 1px solid #333;
-    background: transparent;
-    */
-    min-height:80px;
-    max-height:50%;
-    overflow:auto;
-
-}