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

3 files changed, 22 insertions, 3 deletions

diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 75ccc07d..8a743174 100644
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -48,8 +48,7 @@ input.nj-skinned,
 textarea.nj-skinned, 
 button.nj-skinned,
 select.nj-skinned,
-select.nj-skinned option,
-button.nj-skinned {
+select.nj-skinned option {
         -webkit-appearance: none;
         outline: none;
 }
@@ -122,6 +121,24 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after {
 button.nj-skinned {
         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;
+        text-shadow: 1px 1px 1px $color-app-shadow
+}
+button.nj-skinned:active {
+        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;
 }
 
 // Radio buttons 
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss
index ac82adf8..21ada556 100644
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/_scss/imports/scss/_PanelUI.scss
@@ -390,7 +390,7 @@ ul.treeComponent > img:first-child
 // 
 #pp-container-assets .pp-scroll-linked,
 #pp-container-list .pp-scroll-linked {
-        width: 420px;
+        //width: 420px;
 }
  
 
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss
index 34d5ffc9..2a7b8191 100644
--- a/_scss/imports/themes/default/_colors.scss
+++ b/_scss/imports/themes/default/_colors.scss
@@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40);
 $color-radio-shadow: rgba(200,200,200,0.5);
 $color-radio-gradient-top: rgb(100,100,100);
 $color-radio-gradient-bottom: rgb(60,60,60);
+$color-formgrad-top: rgb(80,80,80);
+$color-formgrad-bottom: rgb(60,60,60);
 $color-radio-bg: rgb(0,0,0);
 $color-radio: rgb(200,200,200);
 $color-input: rgb(255,255,255);