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

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 57 insertions, 57 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index f70cb8cb..65f7bf79 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 .css_panel {
-        background-color: #FFF;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
+    background-color: #FFF;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
     height:100%;
 }
 .css_panel .resizer {
@@ -40,18 +40,18 @@ POSSIBILITY OF SUCH DAMAGE.
     height: 1px;
 }
 .nj-section-header {
-        background-color: #333;
-        border-top: 1px solid #3D3D3D;
-        color: #FFF;
-        cursor: default;
-        font-size: 12px;
-        font-weight: normal;
-        height: 16px;
-        margin: 0;
-        padding: 4px 0 2px 10px;
-        vertical-align: top;
-        -webkit-box-flex: 0;
-        -webkit-user-select: none;
+    background-color: #333;
+    border-top: 1px solid #3D3D3D;
+    color: #FFF;
+    cursor: default;
+    font-size: 12px;
+    font-weight: normal;
+    height: 16px;
+    margin: 0;
+    padding: 4px 0 2px 10px;
+    vertical-align: top;
+    -webkit-box-flex: 0;
+    -webkit-user-select: none;
 }
 #nj-status-heading {
     color: #CCC;
@@ -75,11 +75,11 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-box-orient: vertical;
 }
 .nj-sub-panel {
-        color: #333;
-        padding: 0;
-        overflow: hidden;
-        opacity: 1;
-        -webkit-box-flex: 1;
+    color: #333;
+    padding: 0;
+    overflow: hidden;
+    opacity: 1;
+    -webkit-box-flex: 1;
 }
 .nj-sub-panel.closed {
     opacity: 0;
@@ -92,9 +92,9 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-transform: rotate(-90deg);
 }
 .nj-sub-panel ul {
-        list-style-type: none;
-        margin: 4px 0 5px;
-        padding: 0;
+    list-style-type: none;
+    margin: 4px 0 5px;
+    padding: 0;
 }
 /* ----------------------------------------
           CSS Stylesheet List
@@ -171,16 +171,16 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-box-flex: 1;
 }
 .nj-css-rule-list li {
-        border-top: 1px solid #CCC;
-        padding: 6px;
+    border-top: 1px solid #CCC;
+    padding: 6px;
 }
 .nj-css-rule-list li:first-child {
-        padding-top: 0;
-        border-style: none;
+    padding-top: 0;
+    border-style: none;
 }
 
 .nj-css-rule-list li:after {
-        content: "}";
+    content: "}";
 }
 .nj-css-rule-list li.nj-css-rule-unapplied {
     background-color: #F4F4F4;
@@ -202,8 +202,8 @@ POSSIBILITY OF SUCH DAMAGE.
           CSS Style List
 ---------------------------------------- */
 .nj-css-style-list {
-        padding: 0;
-        margin: 0;
+    padding: 0;
+    margin: 0;
 }
 .nj-css-style-list > div {
     overflow: hidden;
@@ -212,21 +212,21 @@ POSSIBILITY OF SUCH DAMAGE.
     white-space: nowrap;
 }
 .nj-css-style-list dt, .nj-css-style-list dd {
-        border: 1px solid rgba(0,0,0,0);
+    border: 1px solid rgba(0,0,0,0);
     border-radius: 2px;
-        margin: 0;
-        outline: none;
-        padding: 0 2px;
+    margin: 0;
+    outline: none;
+    padding: 0 2px;
 }
 .nj-css-style-list dt {
-        display: inline-block;
-        color: rgb(200,0,0);
+    display: inline-block;
+    color: rgb(200,0,0);
     max-width: 68%;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 .nj-css-style-list dd {
-        display: inline;    
+    display: inline;
 }
 
 /* ----------------------------------------
@@ -234,13 +234,13 @@ POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------- */
 .nj-css-selector {
     display: inline-block;
-        font-weight: bold;
-        padding: 0 2px;
-        outline: none;
+    font-weight: bold;
+    padding: 0 2px;
+    outline: none;
 }
 .nj-css-selector:after {
-        content: " {";
-        font-weight: normal;
+    content: " {";
+    font-weight: normal;
 }
 .nj-css-selector.nj-editable-focus {
     position: relative;
@@ -251,21 +251,21 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 #nj-section-styles dt:after {
-        color: #333;
-        content: ":";
+    color: #333;
+    content: ":";
 }
 #nj-section-styles dd:after {
-        content: ";";
+    content: ";";
 }
 .nj-sheet-link {
-        color: #333;
-        float: right;
-        margin-left: 15px;
-        position: relative;
-        top: -2px;
+    color: #333;
+    float: right;
+    margin-left: 15px;
+    position: relative;
+    top: -2px;
 }
 .nj-sheet-link:hover {
-        color: #666;
+    color: #666;
 }
 .nj-css-rule-list input[type="checkbox"], #nj-sheet-list input[type="checkbox"] {
     float: left;
@@ -401,14 +401,14 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 #nj-section-styles .nj-editable-focus {
     border: 1px solid #999;
-        box-shadow: 1px 1px 1px #CCC;
+    box-shadow: 1px 1px 1px #CCC;
     color: #333;
     display: inline-block;
-        margin-right: 7px;
-        /*margin-bottom: -1px;*/
+    margin-right: 7px;
+    /*margin-bottom: -1px;*/