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

1 files changed, 49 insertions, 50 deletions

diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss
index e72a1502..ac82adf8 100644
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/_scss/imports/scss/_PanelUI.scss
@@ -4,24 +4,23 @@
 // (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 // </copyright>
 
-/*
- * PanelUI.scss
- * Styles governing the panels in the UI.
- * Note that colors and font definitions go in 
- * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
- */
-/* layout for the container of all panels within a dock area */
+// 
+// PanelUI.scss
+// Styles governing the panels in the UI.
+// Note that colors and font definitions go in 
+// _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
+  
+//  layout for the container of all panels within a dock area  
 .panelContainer {
     margin: 0px;
     padding: 0px 0px;
     position:relative;
-    /*
-    this is here to hopefully show vertical scroll bars when the panels exceed the height of the panel
-    unfortunately it doesn't seem to work properly. this is probably due to some of our box styling or positioning
-    overflow: auto;  */
+   // this is here to hopefully show vertical scroll bars when the panels exceed the height of the panel
+   //  unfortunately it doesn't seem to work properly. this is probably due to some of our box styling or positioning
+    overflow: auto;   
 }
 
-/* base layout style for all panels*/
+//  base layout style for all panels 
 .panelDisclosureIcon
 {
     background-image:url("../images/panels/panelDisclosureIcon.png");
@@ -40,7 +39,7 @@
 }
 
 .panelCollapseArrowFill {
-    color: rgba(76,76,76,1); /* this is never really used but is set so we can get it via javascript to draw the control via script on the canvas */
+    color: rgba(76,76,76,1); //  this is never really used but is set so we can get it via javascript to draw the control via script on the canvas  
     padding:0px 4px;
 }
 
@@ -87,11 +86,11 @@
     padding-right:3px;
     width:32px;
 
-    /*This is a hack to get the tools panel to extend all the way to the bottom.*/
+    // This is a hack to get the tools panel to extend all the way to the bottom. 
     padding-bottom:450px;
 }
 
-/* sizes for the specific panels */
+//  sizes for the specific panels  
 
 #toolPropertiesPanel {
     height: 32px;
@@ -102,7 +101,7 @@
     height: 116px;
 }
 
-/* Only used by Animation Presets Panel currently */
+//  Only used by Animation Presets Panel currently  
 
 .treeComponent
 {
@@ -119,7 +118,7 @@
     list-style: none;
 }
 
-/*This sets the style for a tree folder's icon*/
+// This sets the style for a tree folder's icon 
 ul.treeComponent > img:first-child
 {
     margin-left: -35px;
@@ -139,7 +138,7 @@ ul.treeComponent > img:first-child
     margin-left: -20px;
     padding-right:10px;
     vertical-align:middle;
-    /*border-bottom:1px solid #555555;*/
+    // border-bottom:1px solid #555555; 
 }
 
 .treeCategory
@@ -153,8 +152,8 @@ ul.treeComponent > img:first-child
         color: $color-panel-text;
 }
 
-/* ======  Used by Properties Panel ====== */
-/* Removed the outline text input style -> Causing problems with the Canvas */
+//  ======  Used by Properties Panel ======  
+//  Removed the outline text input style -> Causing problems with the Canvas  
 
 .propertiesPanel
 {
@@ -210,7 +209,7 @@ ul.treeComponent > img:first-child
     background-color: $color-panel-shadow;
 }
 
-/* ======  Indexed table row and column classes for Properties Panel layout ====== */
+//  ======  Indexed table row and column classes for Properties Panel layout ======  
 .propRow1{
     width:100%;
 }
@@ -313,7 +312,7 @@ ul.treeComponent > img:first-child
 
 
 
-/* Begin: Project Panel UI classes */
+//  Begin: Project Panel UI classes  
 .Project-Panel {
         height: 100%;
 }
@@ -354,14 +353,14 @@ ul.treeComponent > img:first-child
     margin-bottom: 36px;
 
 }
-/*
+// 
 #pp-container-list,
 #pp-container-assets {
     height: 310px;
     width: 100%;
     overflow: auto;
 }
-*/
+ 
 
 .pp-scroll-main {
         display: block;
@@ -388,12 +387,12 @@ ul.treeComponent > img:first-child
 #pp-view-assets {
         display: none;
 }
-/*
+// 
 #pp-container-assets .pp-scroll-linked,
 #pp-container-list .pp-scroll-linked {
         width: 420px;
 }
-*/
+ 
 
 .pp-header-container {
     position: relative;
@@ -518,10 +517,10 @@ span.pp-span-all:focus {
         display: block;
         width: 9px;
         height: 5px;
-        /*
+        // 
         margin-right: 10px;
         margin-top: 2px;
-        */
+         
         background-image: url("../images/panels/project-panel/icon-sort-arrow.png");
         background-repeat: no-repeat;
         position: absolute;
@@ -559,7 +558,7 @@ span.pp-span-all:focus {
         color: $color-menu-bg;
 }
 
-/* Icons! */
+//  Icons!  
 #pp-container-list li,
 #pp-container-list span.span-space {
     background-repeat: no-repeat;
@@ -660,7 +659,7 @@ span.pp-span-all:focus {
 }
 
 
-/* Buttons */
+//  Buttons  
 .pp-button, 
 #pp-col-buttons .pp-button div {
         margin: 0px;
@@ -748,7 +747,7 @@ div.pp-button.button-divider div {
         display: none;
 }
 
-/* Hide and Show different types of assets */
+//  Hide and Show different types of assets  
 .pp-type-script,
 .pp-type-video,
 .pp-type-audio,
@@ -777,7 +776,7 @@ div.pp-button.button-divider div {
         display: block;
 }
 
-/* New file flyout */
+//  New file flyout  
 .pp-popup {
         position: absolute;