diff options
author | Kruti Shah | 2012-07-17 12:40:00 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-17 12:40:00 -0700 |
commit | bf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch) | |
tree | 2156d9920ea1b7db49ed6460545fea7cda121bae /scss/imports | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
download | ninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'scss/imports')
-rwxr-xr-x | scss/imports/codemirror/_codemirror.scss | 59 | ||||
-rwxr-xr-x | scss/imports/codemirror/_css.scss | 59 | ||||
-rwxr-xr-x | scss/imports/codemirror/_javascript.scss | 59 | ||||
-rwxr-xr-x | scss/imports/scss/_Base.scss | 255 | ||||
-rwxr-xr-x | scss/imports/scss/_Components.scss | 69 | ||||
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 117 | ||||
-rwxr-xr-x | scss/imports/scss/_MenuUI.scss | 65 | ||||
-rw-r--r-- | scss/imports/scss/_MontageOverrides.scss | 61 | ||||
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 489 | ||||
-rwxr-xr-x | scss/imports/scss/_ScrollBars.scss | 97 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 75 | ||||
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 225 | ||||
-rwxr-xr-x | scss/imports/scss/_ToolsSample.scss | 58 | ||||
-rwxr-xr-x | scss/imports/scss/_UserContent.scss | 59 | ||||
-rwxr-xr-x | scss/imports/scss/_Workspace.scss | 59 | ||||
-rwxr-xr-x | scss/imports/scss/_mixins.scss | 61 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 65 | ||||
-rwxr-xr-x | scss/imports/themes/_test.scss | 73 | ||||
-rwxr-xr-x | scss/imports/themes/default/_colors.scss | 105 | ||||
-rwxr-xr-x | scss/imports/themes/default/_fonts.scss | 59 | ||||
-rwxr-xr-x | scss/imports/themes/default/_mixins.scss | 59 |
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 @@ | |||
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. |
3 | All Rights Reserved. | 5 | // All Rights Reserved. |
4 | BSD License. | 6 | // |
5 |