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

Conflicts:
	_scss/compass_app_log.txt
	css/ninja.css

16 files changed, 231 insertions, 321 deletions

diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
deleted file mode 100644
index d28e1e77..00000000
--- a/_scss/compass_app_log.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-2011-09-02 13:25:28 overwrite ../css/ninja.css
-2011-09-02 13:38:07 overwrite ../css/ninja.css
-2011-09-02 13:38:27 overwrite ../css/ninja.css
-2011-09-02 13:39:16 overwrite ../css/ninja.css
-2011-09-02 13:42:04 overwrite ../css/ninja.css
-2011-09-02 13:42:48 overwrite ../css/ninja.css
-2011-09-14 16:53:51 overwrite ../css/ninja.css
-2011-09-14 16:54:56 overwrite ../css/ninja.css
-2011-09-14 16:55:59 overwrite ../css/ninja.css
-2011-09-14 16:57:48 overwrite ../css/ninja.css
-2011-09-14 17:00:26 overwrite ../css/ninja.css
-2011-09-14 17:02:28     error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",")
-2011-09-14 17:02:28 overwrite ../css/ninja.css
-2011-09-14 17:04:10 overwrite ../css/ninja.css
-2011-09-14 17:05:49 overwrite ../css/ninja.css
-2011-09-14 17:08:00 overwrite ../css/ninja.css
-2011-09-14 17:08:36 overwrite ../css/ninja.css
-2011-09-14 17:09:27 overwrite ../css/ninja.css
-2011-09-14 17:10:02 overwrite ../css/ninja.css
-2011-09-14 17:11:37 overwrite ../css/ninja.css
-2011-09-14 17:12:37 overwrite ../css/ninja.css
-2011-09-14 17:14:35 overwrite ../css/ninja.css
-2011-09-14 17:15:36 overwrite ../css/ninja.css
-2011-09-14 17:16:33 overwrite ../css/ninja.css
-2011-09-14 17:17:11 overwrite ../css/ninja.css
-2011-09-14 17:17:19 overwrite ../css/ninja.css
-2011-09-14 17:18:27 overwrite ../css/ninja.css
-2011-09-14 17:19:06 overwrite ../css/ninja.css
-2011-09-14 17:19:22 overwrite ../css/ninja.css
-2011-09-14 17:19:43 overwrite ../css/ninja.css
-2011-09-14 17:20:16 overwrite ../css/ninja.css
-2011-09-14 17:20:39 overwrite ../css/ninja.css
-2011-09-14 17:21:09 overwrite ../css/ninja.css
-2011-09-14 17:21:51 overwrite ../css/ninja.css
-2011-09-14 17:22:33 overwrite ../css/ninja.css
-2011-09-15 13:56:59 overwrite ../css/ninja.css
-2011-09-15 13:57:29 overwrite ../css/ninja.css
-2011-10-03 13:19:40 overwrite ../css/ninja.css
-2011-10-03 13:21:00 overwrite ../css/ninja.css
-2011-10-03 13:21:21 overwrite ../css/ninja.css
-2011-10-03 13:26:42 overwrite ../css/ninja.css
-2011-10-03 13:44:20 overwrite ../css/ninja.css
-2011-10-03 13:44:54 overwrite ../css/ninja.css
-2011-10-03 13:45:14 overwrite ../css/ninja.css
-2011-10-03 13:46:26 overwrite ../css/ninja.css
-2011-10-03 13:46:29 overwrite ../css/ninja.css
-2011-10-04 15:06:33 overwrite ../css/ninja.css
-2011-10-04 15:06:36 overwrite ../css/ninja.css
-2011-10-04 15:06:43 overwrite ../css/ninja.css
-2011-10-04 15:15:22 overwrite ../css/ninja.css
-2011-10-11 16:02:52 overwrite ../css/ninja.css
-2011-10-13 00:13:38 identical ../css/ninja.css
-2011-10-13 00:14:12 overwrite ../css/ninja.css
-2011-10-13 00:15:03 overwrite ../css/ninja.css
-2011-10-26 15:19:00 overwrite ../css/ninja.css
-2011-10-26 15:19:33 overwrite ../css/ninja.css
-2011-11-22 16:21:56 overwrite ../css/ninja.css
-2011-11-22 17:47:41 overwrite ../css/ninja.css
-2011-11-30 01:14:42 overwrite ../css/ninja.css
-2011-11-30 01:15:04 overwrite ../css/ninja.css
-2011-11-30 01:15:09 overwrite ../css/ninja.css
-2011-11-30 16:54:38 overwrite ../css/ninja.css
-2011-12-01 11:38:06 overwrite ../css/ninja.css
-2011-12-01 11:38:11 overwrite ../css/ninja.css
-2011-12-07 12:10:05 overwrite ../css/ninja.css
-2011-12-07 12:10:22 overwrite ../css/ninja.css
-2011-12-07 12:12:11 overwrite ../css/ninja.css
-2011-12-07 12:14:43 overwrite ../css/ninja.css
-2011-12-07 17:32:10 overwrite ../css/ninja.css
-2011-12-07 17:55:01 overwrite ../css/ninja.css
-2011-12-15 14:51:46 overwrite ../css/ninja.css
-2011-12-15 14:52:46 overwrite ../css/ninja.css
-2011-12-15 14:52:59 overwrite ../css/ninja.css
-2011-12-15 14:53:25 overwrite ../css/ninja.css
-2011-12-20 21:56:57 overwrite ../css/ninja.css
-2011-12-30 15:41:28 overwrite ../css/ninja.css
-2011-12-30 15:43:24 overwrite ../css/ninja.css
-2011-12-30 15:45:49 overwrite ../css/ninja.css
-2012-01-12 16:26:20 overwrite ../css/ninja.css
-2012-01-12 16:26:22 overwrite ../css/ninja.css
-2012-01-12 16:26:25 overwrite ../css/ninja.css
-2012-01-19 11:06:48 overwrite ../css/ninja.css
-2012-01-19 11:06:55 overwrite ../css/ninja.css
-2012-01-19 11:11:16 overwrite ../css/ninja.css
-2012-01-19 14:30:22 overwrite ../css/ninja.css
-2012-01-19 14:35:47 overwrite ../css/ninja.css
-2012-01-19 14:38:18 overwrite ../css/ninja.css
-2012-01-19 14:40:59 overwrite ../css/ninja.css
-2012-01-19 14:41:24 overwrite ../css/ninja.css
-2012-01-20 15:13:41 overwrite ../css/ninja.css
-2012-01-20 15:14:27 overwrite ../css/ninja.css
-2012-01-20 15:15:32 overwrite ../css/ninja.css
-2012-01-20 15:16:38 overwrite ../css/ninja.css
-2012-01-20 15:17:03 overwrite ../css/ninja.css
-2012-01-20 15:17:39 overwrite ../css/ninja.css
-2012-01-30 16:28:54 overwrite ../css/ninja.css
-2012-01-30 16:29:04 overwrite ../css/ninja.css
-2012-01-30 16:33:31 overwrite ../css/ninja.css
-2012-01-30 17:18:02 overwrite ../css/ninja.css
-2012-01-30 18:28:44 overwrite ../css/ninja.css
-2012-02-02 17:20:26 overwrite ../css/ninja.css
-2012-02-02 17:20:31 identical ../css/ninja.css
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index f9a1cfa3..8a743174 100644
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -4,12 +4,12 @@
 // (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 // </copyright>
 
-/*
- * Base.scss
- * Base styles for entire application.
- * Note that colors and font definitions go in 
- * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
- */
+
+//Base.scss
+//Base styles for entire application.
+//Note that colors and font definitions go in 
+//_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
+
 
 .clear {
     display: block;
@@ -42,19 +42,18 @@
     float: right;
 }
 
-/* Begin: Basic skinning for form fields */
-/* Reset all */
+// Begin: Basic skinning for form fields 
+// Reset all 
 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;
 }
 
-/* Base styles */
+// Base styles
 input[type="text"].nj-skinned,
 input[type="password"].nj-skinned,
 input[type="search"].nj-skinned,
@@ -68,7 +67,7 @@ select.nj-skinned option {
         font-family: 'Droid Sans', sans-serif;
 }
 
-/* Disabled styles */
+// Disabled styles
 input.nj-skinned:disabled,
 textarea.nj-skinned:disabled,
 select.nj-skinned:disabled,
@@ -76,7 +75,7 @@ button.nj-skinned:disabled {
         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,
@@ -84,7 +83,7 @@ select.nj-skinned,
 select.nj-skinned option {
         height: 13px;
 }
-/*
+//
 input[type="text"].nj-skinned:focus,
 input[type="password"].nj-skinned:focus,
 input[type="search"].nj-skinned:focus,
@@ -93,7 +92,7 @@ select.nj-skinned:focus,
 select.nj-skinned option:focus {
         -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
 }
-*/
+
 
 select.nj-skinned {
     background-image: url("../images/dropdown-bg.png");
@@ -118,13 +117,31 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after {
         content:"\2716";
 }
 
-/* Buttons */
+// Buttons 
 button.nj-skinned {
         font-size: 9px;
     cursor: pointer;
+        display: block;