Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-07-17 09:30:22 -0700
committer: Jonathan Duran 2012-07-17 09:30:22 -0700
commit: 53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree: 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /scss/imports
parent: 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent: 5146f224258929415adf4a8022e492454b4e2476 (diff)
download: ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
21 files changed, 1145 insertions, 1083 deletions
diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index b8cb34ca..e40b01bc 100755
--- a/scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
@@ -1,32 +1,35 @@
-/* <copyright>
+@charset "UTF-8";
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
+// <copyright>
-modification, are permitted provided that the following conditions are met:
+// Copyright (c) 2012, Motorola Mobility LLC.
+// All Rights Reserved.
-  - Redistributions of source code must retain the above copyright notice,
+// 
-    this list of conditions and the following disclaimer.
+// Redistribution and use in source and binary forms, with or without
-  - Redistributions in binary form must reproduce the above copyright
+// modification, are permitted provided that the following conditions are met:
-    notice, this list of conditions and the following disclaimer in the
+// 
-    documentation and/or other materials provided with the distribution.
+// * Redistributions of source code must retain the above copyright notice,
-  - Neither the name of Motorola Mobility nor the names of its contributors
+//   this list of conditions and the following disclaimer.
-    may be used to endorse or promote products derived from this software
+// 
-    without specific prior written permission.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//   and/or other materials provided with the distribution.
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// * Neither the name of Motorola Mobility LLC nor the names of its
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+//   contributors may be used to endorse or promote products derived from this
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+//   software without specific prior written permission.
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-POSSIBILITY OF SUCH DAMAGE.
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-</copyright> */
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+// </copyright> 
 .CodeMirror {
  overflow: auto;
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index f91a5b2f..49f9f0b6 100755
--- a/scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
@@ -1,32 +1,35 @@
-/* <copyright>
+@charset "UTF-8";
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
+// <copyright>
-modification, are permitted provided that the following conditions are met:
+// Copyright (c) 2012, Motorola Mobility LLC.
+// All Rights Reserved.
-  - Redistributions of source code must retain the above copyright notice,
+// 
-    this list of conditions and the following disclaimer.
+// Redistribution and use in source and binary forms, with or without
-  - Redistributions in binary form must reproduce the above copyright
+// modification, are permitted provided that the following conditions are met:
-    notice, this list of conditions and the following disclaimer in the
+// 
-    documentation and/or other materials provided with the distribution.
+// * Redistributions of source code must retain the above copyright notice,
-  - Neither the name of Motorola Mobility nor the names of its contributors
+//   this list of conditions and the following disclaimer.
-    may be used to endorse or promote products derived from this software
+// 
-    without specific prior written permission.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//   and/or other materials provided with the distribution.
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// * Neither the name of Motorola Mobility LLC nor the names of its
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+//   contributors may be used to endorse or promote products derived from this
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+//   software without specific prior written permission.
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-POSSIBILITY OF SUCH DAMAGE.
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-</copyright> */
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+// </copyright> 
 span.css-at {color: #708;}
 span.css-unit {color: #281;}
diff --git a/scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss
index 6499783e..ea9ba9b2 100755
--- a/scss/imports/codemirror/_javascript.scss
+++ b/scss/imports/codemirror/_javascript.scss
@@ -1,32 +1,35 @@
-/* <copyright>
+@charset "UTF-8";
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
+// <copyright>
-modification, are permitted provided that the following conditions are met:
+// Copyright (c) 2012, Motorola Mobility LLC.
+// All Rights Reserved.
-  - Redistributions of source code must retain the above copyright notice,
+// 
-    this list of conditions and the following disclaimer.
+// Redistribution and use in source and binary forms, with or without
-  - Redistributions in binary form must reproduce the above copyright
+// modification, are permitted provided that the following conditions are met:
-    notice, this list of conditions and the following disclaimer in the
+// 
-    documentation and/or other materials provided with the distribution.
+// * Redistributions of source code must retain the above copyright notice,
-  - Neither the name of Motorola Mobility nor the names of its contributors
+//   this list of conditions and the following disclaimer.
-    may be used to endorse or promote products derived from this software
+// 
-    without specific prior written permission.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+//   and/or other materials provided with the distribution.
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// * Neither the name of Motorola Mobility LLC nor the names of its
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+//   contributors may be used to endorse or promote products derived from this
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+//   software without specific prior written permission.
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-POSSIBILITY OF SUCH DAMAGE.
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-</copyright> */
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+// </copyright>
 span.js-keyword {color: #90b;}
 span.js-atom {color: #291;}
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 78a3bbaf..7ceb3ab0 100755
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
@@ -1,37 +1,40 @@
+@charset "UTF-8";
 // <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+// Copyright (c) 2012, Motorola Mobility LLC.
author	Jonathan Duran	2012-07-17 09:30:22 -0700
committer	Jonathan Duran	2012-07-17 09:30:22 -0700
commit	53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree	79d542ee811044e8af2ef84aa0d6662c6eb895c4 /scss/imports
parent	7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent	5146f224258929415adf4a8022e492454b4e2476 (diff)
download	ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz

diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss index b8cb34ca..e40b01bc 100755 --- a/scss/imports/codemirror/_codemirror.scss +++ b/scss/imports/codemirror/_codemirror.scss
@@ -1,32 +1,35 @@
1	/* <copyright>	1	@charset "UTF-8";
2	Copyright (c) 2012, Motorola Mobility, Inc
3	All Rights Reserved.
4	BSD License.
5		2
6	Redistribution and use in source and binary forms, with or without	3	// <copyright>
7	modification, are permitted provided that the following conditions are met:	4	// Copyright (c) 2012, Motorola Mobility LLC.
8		5	// All Rights Reserved.
9	- Redistributions of source code must retain the above copyright notice,	6	//
10	this list of conditions and the following disclaimer.	7	// Redistribution and use in source and binary forms, with or without
11	- Redistributions in binary form must reproduce the above copyright	8	// modification, are permitted provided that the following conditions are met:
12	notice, this list of conditions and the following disclaimer in the	9	//
13	documentation and/or other materials provided with the distribution.	10	// * Redistributions of source code must retain the above copyright notice,
14	- Neither the name of Motorola Mobility nor the names of its contributors	11	// this list of conditions and the following disclaimer.
15	may be used to endorse or promote products derived from this software	12	//
16	without specific prior written permission.	13	// * Redistributions in binary form must reproduce the above copyright notice,
17		14	// this list of conditions and the following disclaimer in the documentation
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	15	// and/or other materials provided with the distribution.
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	16	//
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	17	// * Neither the name of Motorola Mobility LLC nor the names of its
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	18	// contributors may be used to endorse or promote products derived from this
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	19	// software without specific prior written permission.
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	20	//
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	21	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	22	// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	23	// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	24	// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
28	POSSIBILITY OF SUCH DAMAGE.	25	// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29	</copyright> */	26	// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		27	// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		28	// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		29	// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		30	// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		31	// POSSIBILITY OF SUCH DAMAGE.
		32	// </copyright>
30		33
31	.CodeMirror {	34	.CodeMirror {
32	overflow: auto;	35	overflow: auto;


diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss index f91a5b2f..49f9f0b6 100755 --- a/scss/imports/codemirror/_css.scss +++ b/scss/imports/codemirror/_css.scss
@@ -1,32 +1,35 @@
1	/* <copyright>	1	@charset "UTF-8";
2	Copyright (c) 2012, Motorola Mobility, Inc
3	All Rights Reserved.
4	BSD License.
5		2
6	Redistribution and use in source and binary forms, with or without	3	// <copyright>
7	modification, are permitted provided that the following conditions are met:	4	// Copyright (c) 2012, Motorola Mobility LLC.
8		5	// All Rights Reserved.
9	- Redistributions of source code must retain the above copyright notice,	6	//
10	this list of conditions and the following disclaimer.	7	// Redistribution and use in source and binary forms, with or without
11	- Redistributions in binary form must reproduce the above copyright	8	// modification, are permitted provided that the following conditions are met:
12	notice, this list of conditions and the following disclaimer in the	9	//
13	documentation and/or other materials provided with the distribution.	10	// * Redistributions of source code must retain the above copyright notice,
14	- Neither the name of Motorola Mobility nor the names of its contributors	11	// this list of conditions and the following disclaimer.
15	may be used to endorse or promote products derived from this software	12	//
16	without specific prior written permission.	13	// * Redistributions in binary form must reproduce the above copyright notice,
17		14	// this list of conditions and the following disclaimer in the documentation
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	15	// and/or other materials provided with the distribution.
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	16	//
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	17	// * Neither the name of Motorola Mobility LLC nor the names of its
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	18	// contributors may be used to endorse or promote products derived from this
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	19	// software without specific prior written permission.
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	20	//
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	21	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	22	// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	23	// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	24	// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
28	POSSIBILITY OF SUCH DAMAGE.	25	// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29	</copyright> */	26	// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		27	// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		28	// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		29	// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		30	// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		31	// POSSIBILITY OF SUCH DAMAGE.
		32	// </copyright>
30		33
31	span.css-at {color: #708;}	34	span.css-at {color: #708;}
32	span.css-unit {color: #281;}	35	span.css-unit {color: #281;}


diff --git a/scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss index 6499783e..ea9ba9b2 100755 --- a/scss/imports/codemirror/_javascript.scss +++ b/scss/imports/codemirror/_javascript.scss
@@ -1,32 +1,35 @@
1	/* <copyright>	1	@charset "UTF-8";
2	Copyright (c) 2012, Motorola Mobility, Inc
3	All Rights Reserved.
4	BSD License.
5		2
6	Redistribution and use in source and binary forms, with or without	3	// <copyright>
7	modification, are permitted provided that the following conditions are met:	4	// Copyright (c) 2012, Motorola Mobility LLC.
8		5	// All Rights Reserved.
9	- Redistributions of source code must retain the above copyright notice,	6	//
10	this list of conditions and the following disclaimer.	7	// Redistribution and use in source and binary forms, with or without
11	- Redistributions in binary form must reproduce the above copyright	8	// modification, are permitted provided that the following conditions are met:
12	notice, this list of conditions and the following disclaimer in the	9	//
13	documentation and/or other materials provided with the distribution.	10	// * Redistributions of source code must retain the above copyright notice,
14	- Neither the name of Motorola Mobility nor the names of its contributors	11	// this list of conditions and the following disclaimer.
15	may be used to endorse or promote products derived from this software	12	//
16	without specific prior written permission.	13	// * Redistributions in binary form must reproduce the above copyright notice,
17		14	// this list of conditions and the following disclaimer in the documentation
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	15	// and/or other materials provided with the distribution.
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	16	//
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	17	// * Neither the name of Motorola Mobility LLC nor the names of its
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	18	// contributors may be used to endorse or promote products derived from this
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	19	// software without specific prior written permission.
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	20	//
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	21	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	22	// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	23	// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	24	// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
28	POSSIBILITY OF SUCH DAMAGE.	25	// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29	</copyright> */	26	// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		27	// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		28	// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		29	// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		30	// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		31	// POSSIBILITY OF SUCH DAMAGE.
		32	// </copyright>
30		33
31	span.js-keyword {color: #90b;}	34	span.js-keyword {color: #90b;}
32	span.js-atom {color: #291;}	35	span.js-atom {color: #291;}


diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss index 78a3bbaf..7ceb3ab0 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss
@@ -1,37 +1,40 @@
		1	@charset "UTF-8";
		2
1	// <copyright>	3	// <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc	4	// Copyright (c) 2012, Motorola Mobility LLC.