Merge branch 'refs/heads/NinjaInternal' into Color

2 files changed, 17 insertions, 2 deletions

diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
index 00a7f071..463846ba 100644
--- a/_scss/compass_app_log.txt
+++ b/_scss/compass_app_log.txt
@@ -106,3 +106,4 @@
 2012-01-27 16:12:29 overwrite ../css/ninja.css
 2012-01-27 16:13:46 overwrite ../css/ninja.css
 2012-01-27 16:14:02 overwrite ../css/ninja.css
+2012-01-31 17:22:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 75ccc07d..77faa8f3 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,21 @@ 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-radio-gradient-top 0%, $color-radio-gradient-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:hover {
+        background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 
 }
 
 // Radio buttons