Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

4 files changed, 80 insertions, 76 deletions

diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 0767c300..e29341f8 100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
@@ -1,24 +1,25 @@
 // <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -39,13 +40,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .docAreaBackground {
-        color: black;
-        background: black;
+    color: black;
+    background: black;
 }
 
 .mainStageBackground {
-        color: white;
-        background: gray;
+    color: white;
+    background: gray;
 }
 
 .stageContentShadow {
@@ -55,9 +56,9 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .panelBackground {
-        color: white;
-        /*border: solid 1px #333;*/
-        background: rgba(41,41,41,1);
+    color: white;
+    /*border: solid 1px #333;*/
+    background: rgba(41,41,41,1);
 }
 
 .panelCollapseControlBackground {
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index d22cb29a..8f99a175 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -1,24 +1,25 @@
 // <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -34,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 //Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
 
 
-//  Colors for radio buttons and other form elements  
+//  Colors for radio buttons and other form elements
 $color-radio-border: rgb(40,40,40);
 $color-radio-shadow: rgba(200,200,200,0.5);
 $color-radio-gradient-top: rgb(100,100,100);
@@ -49,27 +50,27 @@ $color-input-border: rgb(49, 49, 49);
 $color-focus-outline: rgb(180, 180, 180);
 $color-transparent: rgba(0,0,0,0);
 
-//  Base colors for dividers 
-// Dividers consist of a div with a background color and either 
+//  Base colors for dividers
+// Dividers consist of a div with a background color and either
 // a top & bottom border (in the case of horizontal dividers)
 // or a left & right border (in the case of vertical dividers),
 // for a total of three different colors.
-// 
-  
-$color-divider-first: rgb(35,35,35); //  top and left  
-$color-divider-second: rgb(0,0,0); //  Middle  
-$color-divider-third: rgb(58,58,58); //  Bottom and right  
-
-//  Main background color of entire app  
-$color-app-bg: rgb(0,0,0); //  Main app background color.  
-$color-app-bg-a1: rgba(0,0,0,1);  //  rgba version  
-$color-app-border: rgb(51,51,51); //  Main app border color  
-$color-app-shadow: rgba(0,0,0,.5); //  color of drop shadows  
-$color-stage: rgb(128,128,128); //  Stage color  
-$color-body-border: rgb(0,0,0); //  body border color  
-$color-body-bg: rgb(255,255,255); //  Body background color  
-
-//  Colors for main dropdown menus: background & text for both regular and highlighted states, dividers  
+//
+
+$color-divider-first: rgb(35,35,35); //  top and left
+$color-divider-second: rgb(0,0,0); //  Middle
+$color-divider-third: rgb(58,58,58); //  Bottom and right
+
+//  Main background color of entire app
+$color-app-bg: rgb(0,0,0); //  Main app background color.
+$color-app-bg-a1: rgba(0,0,0,1);  //  rgba version
+$color-app-border: rgb(51,51,51); //  Main app border color
+$color-app-shadow: rgba(0,0,0,.5); //  color of drop shadows
+$color-stage: rgb(128,128,128); //  Stage color
+$color-body-border: rgb(0,0,0); //  body border color
+$color-body-bg: rgb(255,255,255); //  Body background color
+
+//  Colors for main dropdown menus: background & text for both regular and highlighted states, dividers
 $color-menu-bg: rgb(71,71,71);
 $color-menu-text: rgb(255,255,255);
 $color-menu-hilite-bg: rgb(178,178,178);
@@ -79,7 +80,7 @@ $color-menu-border: rgb(0,0,0);
 $color-menu-active-bg: rgb(181,122,10);
 
 
-//  Colors for tools: background, text, how they interact with the UI  
+//  Colors for tools: background, text, how they interact with the UI
 $color-tool-bg: rgb(41,41,41);
 $color-tool-bg-active: rgb(178,178,178);
 $color-tool-border-selected: rgb(89,89,89);
@@ -94,15 +95,15 @@ $color-tool-select-border: rgb(0,0,0);
 $color-tool-select-hover-bg: rgb(221,221,221);
 
 
-//  Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc.  
+//  Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc.
 $color-panel-bg: $color-menu-bg;
 $color-panel-text: $color-menu-text;
 $color-panel-input: $color-panel-text;
 $color-panel-hilite-bg: $color-menu-hilite-bg;
 $color-panel-hilite-text: $color-menu-hilite-text;
-$color-panel-clickable: rgb(215,215,215); //  used for editable items in their non-edit state, etc.  
-$color-panel-border: $color-menu-border; //  Border for panel and for block elements  
-$color-panel-shadow: rgb(58,58,58); //  Shadow for text and block elements  
+$color-panel-clickable: rgb(215,215,215); //  used for editable items in their non-edit state, etc.
+$color-panel-border: $color-menu-border; //  Border for panel and for block elements
+$color-panel-shadow: rgb(58,58,58); //  Shadow for text and block elements
 $color-panel-input-bg: rgb(68, 68, 68);
 $color-panel-dividerlabel-bg: rgb(62, 62, 62);
 $color-panel-input-border: rgb(49, 49, 49);
@@ -110,7 +111,7 @@ $color-panel-divider-top: rgb(62, 62, 62);
 $color-panel-divider: $color-menu-divider;
 $color-panel-divider-bottom: rgb(86, 86, 86);