Merge branch 'refs/heads/NinjaInternal' into Color

1 files changed, 0 insertions, 641 deletions

diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Tools.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Tools.scssc
deleted file mode 100644
index ce89ae73..00000000
--- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Tools.scssc
+++ /dev/null
@@ -1,641 +0,0 @@
-3.0.24 (Classy Cassidy)
-8b1136da996612d3c309c58e3939e0872f7da4d6
-o:Sass::Tree::RootNode
-:
-@linei:
@options{:
-style:
expanded:load_paths[",/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:line_commentsT:
-quietT:
filename"E/Users/rmwh84/Sites/Ninja/MainApp/_scss/imports/scss/_Tools.scss:css_filename"=/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css/ninja.css:property_syntax0:@template"$'/* <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> */
-
-/*
- * Tools.scss
- * For individual tool styles in the toolbar, see toolbar.scss.
- * Note that colors and font definitions go in 
- * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
- * 
- */
-
-/*Made changes to toolButton */
-
-.toolButton {
-    width:26px;
-    height:23px;
-    padding: 0px;
-    margin:1px;
-    border-width: 1px;
-    border-style: solid; 
-}
-
-.subToolButton {
-    float:left;
-}
-
-#topPanelContainer .subToolButton {
-
-}
-
-.subOption{
-    float:left;
-    /*margin:10px;*/
-    margin-top: 5px;
-    margin-left: 10px;
-    margin-right: 10px;
-}
-
-.toolButton:active {   
-    border-top-width: 1px;
-    border-top-style: solid; 
-    border-left-width: 1px;
-    border-left-style: solid; 
-}
-
-.toolButtonSelected {
-    border-top-width: 1px;
-    border-top-style: solid; 
-    border-left-width: 1px;
-    border-left-style: solid;
-
-}
-
-.toolSeparator {
-    height:1px;
-    width:30px;
-    /*margin-left: 3px;*/
-    /*margin-right: 3px;*/
-}
-
-.toolSeparatorTop {
-    margin-top: 3px;
-    margin-bottom: 0px;
-}
-
-.toolSeparatorMiddle {
-    margin-top: 0px;
-    margin-bottom: 0px;
-}
-
-.toolSeparatorBottom {
-    margin-top: 0px;
-    margin-bottom: 3px;
-}
-
-.toolImageBase {
-    padding: 0px;
-    width: 26px;
-    height: 23px;
-    opacity: 0.7;
-    background-repeat:no-repeat;
-}
-
-.toolImageBase:hover {
-   opacity: 1.0;
-   }
-
-
-.drawingMode {
-    outline:blue solid thin;
-}
-
-
-/* Added new styling Sub Tool Shape Options*/
-
-.textBox {
-
-   padding-top:3px;
-   min-width:10em;
-   /*height:14px;*/
-   margin-left:5px;
-   position:relative;
-   margin-top:0px;
-}
-
-.selectBox {
-   width:10em;
-   opacity: 0.9;
-   margin-left: 10px;
-   float:left;
-   display:block;
-   background-color: $color-tool-select-bg;
-   /*-webkit-border-radius: 0;*/
-   border: 1px solid $color-tool-select-border;
-   color:$color-tool-text;
-   outline:none;
-}
-
-.selectBox:hover, .selectBox:active {
-    background-color: $color-tool-select-hover-bg;
-    opacity: 1;
-    color:$color-tool-select-border;
-}
-
-/* Commented out by Jon Reid.
- * If you need to style a label, please either apply a class or 
- * specify a cascade (e.g., "#toolsPanel label")
- * to avoid styling ALL the labels in the app.
-
-label{
-   font-size:12px;
-   display:inline;
-}
- */
-
-
-.label{
-   padding-top:3px;
-   margin-left:10px;
-   font-size:12px;
-   /*display:inline;*/
-   /*line-height:10px;*/
-   float:left;
-   margin-right:5px;
-}
-
-.subToolPropertiespanel{
-   margin-left:43px;
-}
-
-
-.LockToolUp {
-    background-image: url("../images/optionsbar/link.png");
-    background-repeat:no-repeat;
-    width:17px;
-    height:18px;
-
-    margin-right:10px;
-}
-
-.UnLockToolUp {
-    background-image: url("../images/optionsbar/unlinked.png");
-
-    background-repeat:no-repeat;
-    width:17px;
-    height:18px;
-
-    margin-right:10px;
-}
-
-
-.cornerRadius {
-    background-image: url("../images/optionsbar/rectangle/cornerRadius.png");
-    background-repeat:no-repeat;
-    width:16px;
-    height:16px;
-
-    opacity:0.7;
-}
-
-.cornerRadius:hover, .cornerRadius:active {
-    opacity:1;
-}
-
-.cornerRadius.topLeft
-{
-    -webkit-transform: rotate(0deg);
-}
-
-.cornerRadius.topRight
-{
-    -webkit-transform: rotate(90deg);
-    margin-right : -2px;
-}