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

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

13 files changed, 491 insertions, 491 deletions

diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 78a3bbaf..c5a2949b 100755
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 //Base.scss
 //Base styles for entire application.
-//Note that colors and font definitions go in 
+//Note that colors and font definitions go in
 //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
 
 
@@ -45,9 +45,9 @@ POSSIBILITY OF SUCH DAMAGE.
     font-weight: bold;
 }
 :focus {
-        outline: none;
-        border: none;
-        -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline;
+    outline: none;
+    border: none;
+    -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline;
 
 }
 .layout-table {
@@ -57,7 +57,7 @@ POSSIBILITY OF SUCH DAMAGE.
     display: table-row;
 }
 .layout-cell {
-    display: table-cell; 
+    display: table-cell;
 }
 .layout-table .flexor div:first-child {
     float: left;
@@ -66,15 +66,15 @@ POSSIBILITY OF SUCH DAMAGE.
     float: right;
 }
 
-// Begin: Basic skinning for form fields 
-// Reset all 
-input.nj-skinned, 
-textarea.nj-skinned, 
+// Begin: Basic skinning for form fields
+// Reset all
+input.nj-skinned,
+textarea.nj-skinned,
 button.nj-skinned,
 select.nj-skinned,
 select.nj-skinned option {
-        -webkit-appearance: none;
-        outline: none;
+    -webkit-appearance: none;
+    outline: none;
 }
 
 // Base styles
@@ -84,11 +84,11 @@ input[type="search"].nj-skinned,
 textarea.nj-skinned,
 select.nj-skinned,
 select.nj-skinned option {
-        border: 1px solid $color-input-border;
-        color: $color-input;
-        background-color: $color-input-bg;
-        font-size: 12px;
-        font-family: 'Droid Sans', sans-serif;
+    border: 1px solid $color-input-border;
+    color: $color-input;
+    background-color: $color-input-bg;
+    font-size: 12px;
+    font-family: 'Droid Sans', sans-serif;
 }
 
 // Disabled styles
@@ -96,16 +96,16 @@ input.nj-skinned:disabled,
 textarea.nj-skinned:disabled,
 select.nj-skinned:disabled,
 button.nj-skinned:disabled {
-        opacity: 0.4;
+    opacity: 0.4;
 }
 
-// Text inputs and select boxes 
+// Text inputs and select boxes
 input[type="text"].nj-skinned,
 input[type="password"].nj-skinned,
 input[type="search"].nj-skinned,
 select.nj-skinned,
 select.nj-skinned option {
-        height: 13px;
+    height: 13px;
 }
 //
 input[type="text"].nj-skinned:focus,
@@ -114,7 +114,7 @@ input[type="search"].nj-skinned:focus,
 textarea.nj-skinned:focus,
 select.nj-skinned:focus,
 select.nj-skinned option:focus {
-        -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
+    -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
 }
 
 
@@ -122,99 +122,99 @@ select.nj-skinned {
     background-image: url("../images/dropdown-bg.png");
     background-repeat: no-repeat;
     background-position: right center;
-        font-size: 12px;
-        height: 16px;
-        padding-right: 20px;
+    font-size: 12px;
+    height: 16px;
+    padding-right: 20px;
 }
 
 input[type="search"].nj-skinned {
-        height: 17px ;
-        -webkit-box-shadow: none;
+    height: 17px ;
+    -webkit-box-shadow: none;
 }
 input[type="search"].nj-skinned::-webkit-search-cancel-button {
-        -webkit-appearance: none;
-        font-size: 10px;
-        height: 10px;
-        width: 10px;
+    -webkit-appearance: none;
+    font-size: 10px;
+    height: 10px;
+    width: 10px;
 }
 input[type="search"].nj-skinned::-webkit-search-cancel-button:after {
-        content:"\2716";
+    content:"\2716";
 }
 
-// Buttons 
+// Buttons
 button.nj-skinned {
-        font-size: 9px;
+    font-size: 9px;
+    cursor: pointer;
+    display: block;
+    border: 0px;
+    margin: 0px;
+    padding: 4px;
+    border: 1px $color-input-border solid;
+    background-color: $color-menu-bg;
+    background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%);
+    border-radius: 4px;
+    color: $color-menu-text;
+    text-transform: uppercase;
     cursor: pointer;
-        display: block;
-        border: 0px;
-        margin: 0px;
-        padding: 4px;
-        border: 1px $color-input-border solid;
-        background-color: $color-menu-bg;
-        background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%);
-        border-radius: 4px;
-        color: $color-menu-text;
-        text-transform: uppercase;
-        cursor: pointer;
-        text-shadow: 1px 1px 1px $color-app-shadow
+    text-shadow: 1px 1px 1px $color-app-shadow
 }
 button.nj-skinned:active, button.nj-skinned.active {
-        background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); 
+    background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%);
 }
 button.nj-skinned:hover {
-        -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
+    -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
 }
 
-// Radio buttons 
+// Radio buttons
 input[type="radio"].nj-skinned {
-        background-color: $color-menu-bg;
-        background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%);
-        color: $color-radio;
-        border: 2px solid $color-radio-border;
-        width: 12px;
-        height: 12px;
-        overflow: hidden;
-        border-radius: 10px;
-        font-size: 16px;
-        line-height: 7px;
-        text-indent: -7px;
-        cursor: pointer;
+    background-color: $color-menu-bg;
+    background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%);
+    color: $color-radio;
+    border: 2px solid $color-radio-border;
+    width: 12px;
+    height: 12px;
+    overflow: hidden;
+    border-radius: 10px;
+    font-size: 16px;
+    line-height: 7px;
+    text-indent: -7px;
+    cursor: pointer;
     -webkit-box-shadow: 0px 0px 2px $color-radio-shadow;
     -moz-box-shadow: 0px 0px 2px $color-radio-shadow;
     box-shadow: 0px 0px 2px $color-radio-shadow;
 }