aboutsummaryrefslogtreecommitdiff
path: root/scss/imports/codemirror
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /scss/imports/codemirror
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
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>
Diffstat (limited to 'scss/imports/codemirror')
-rwxr-xr-xscss/imports/codemirror/_codemirror.scss59
-rwxr-xr-xscss/imports/codemirror/_css.scss59
-rwxr-xr-xscss/imports/codemirror/_javascript.scss59
3 files changed, 93 insertions, 84 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 @@
1/* <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility, Inc
3All Rights Reserved.
4BSD License.
5 2
6Redistribution and use in source and binary forms, with or without 3// <copyright>
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15// and/or other materials provided with the distribution.
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16//
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17// * Neither the name of Motorola Mobility LLC nor the names of its
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 18// contributors may be used to endorse or promote products derived from this
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 19// software without specific prior written permission.
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 20//
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27ARISING 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
28POSSIBILITY 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";
2Copyright (c) 2012, Motorola Mobility, Inc
3All Rights Reserved.
4BSD License.
5 2
6Redistribution and use in source and binary forms, with or without 3// <copyright>
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15// and/or other materials provided with the distribution.
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16//
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17// * Neither the name of Motorola Mobility LLC nor the names of its
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 18// contributors may be used to endorse or promote products derived from this
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 19// software without specific prior written permission.
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 20//
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27ARISING 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
28POSSIBILITY 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
31span.css-at {color: #708;} 34span.css-at {color: #708;}
32span.css-unit {color: #281;} 35span.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";
2Copyright (c) 2012, Motorola Mobility, Inc
3All Rights Reserved.
4BSD License.
5 2
6Redistribution and use in source and binary forms, with or without 3// <copyright>
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15// and/or other materials provided with the distribution.
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16//
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17// * Neither the name of Motorola Mobility LLC nor the names of its
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 18// contributors may be used to endorse or promote products derived from this
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 19// software without specific prior written permission.
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 20//
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27ARISING 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
28POSSIBILITY 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
31span.js-keyword {color: #90b;} 34span.js-keyword {color: #90b;}
32span.js-atom {color: #291;} 35span.js-atom {color: #291;}