diff options
author | Valerio Virgillito | 2012-07-16 13:15:27 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-16 13:15:27 -0700 |
commit | fe1e956b527c2cf4ecf10645810f3ff750e9e522 (patch) | |
tree | 2cde04bfd925092c30cedabebad2d247c69c373d /scss | |
parent | 289e821c819d0fded21b97ec6e4ed27dd6f30ab4 (diff) | |
parent | 156f15cec3203528a78783d075d4b8f1eb40c06d (diff) | |
download | ninja-fe1e956b527c2cf4ecf10645810f3ff750e9e522.tar.gz |
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'scss')
22 files changed, 650 insertions, 610 deletions
diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss index 58d60b55..e40b01bc 100755 --- a/scss/imports/codemirror/_codemirror.scss +++ b/scss/imports/codemirror/_codemirror.scss | |||
@@ -1,33 +1,35 @@ | |||
1 | /* <copyright> | 1 | @charset "UTF-8"; |
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | 2 | ||
5 | Redistribution and use in source and binary forms, with or without | 3 | // <copyright> |
6 | modification, are permitted provided that the following conditions are met: | 4 | // Copyright (c) 2012, Motorola Mobility LLC. |
7 | 5 | // All Rights Reserved. | |
8 | * Redistributions of source code must retain the above copyright notice, | 6 | // |
9 | this list of conditions and the following disclaimer. | 7 | // Redistribution and use in source and binary forms, with or without |
10 | 8 | // modification, are permitted provided that the following conditions are met: | |
11 | * Redistributions in binary form must reproduce the above copyright notice, | 9 | // |
12 | this list of conditions and the following disclaimer in the documentation | 10 | // * Redistributions of source code must retain the above copyright notice, |
13 | and/or other materials provided with the distribution. | 11 | // this list of conditions and the following disclaimer. |
14 | 12 | // | |
15 | * Neither the name of Motorola Mobility LLC nor the names of its | 13 | // * Redistributions in binary form must reproduce the above copyright notice, |
16 | contributors may be used to endorse or promote products derived from this | 14 | // this list of conditions and the following disclaimer in the documentation |
17 | software without specific prior written permission. | 15 | // and/or other materials provided with the distribution. |
18 | 16 | // | |
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 17 | // * Neither the name of Motorola Mobility LLC nor the names of its |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 18 | // contributors may be used to endorse or promote products derived from this |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 19 | // software without specific prior written permission. |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | 20 | // |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 21 | // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 22 | // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 23 | // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 24 | // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 25 | // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
29 | POSSIBILITY OF SUCH DAMAGE. | 27 | // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
30 | </copyright> */ | 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> | ||
31 | 33 | ||
32 | .CodeMirror { | 34 | .CodeMirror { |
33 | overflow: auto; | 35 | overflow: auto; |
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss index f92de35d..49f9f0b6 100755 --- a/scss/imports/codemirror/_css.scss +++ b/scss/imports/codemirror/_css.scss | |||
@@ -1,33 +1,35 @@ | |||
1 | /* <copyright> | 1 | @charset "UTF-8"; |
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | 2 | ||
5 | Redistribution and use in source and binary forms, with or without | 3 | // <copyright> |
6 | modification, are permitted provided that the following conditions are met: | 4 | // Copyright (c) 2012, Motorola Mobility LLC. |
7 | 5 | // All Rights Reserved. | |
8 | * Redistributions of source code must retain the above copyright notice, | 6 | // |
9 | this list of conditions and the following disclaimer. | 7 | // Redistribution and use in source and binary forms, with or without |
10 | 8 | // modification, are permitted provided that the following conditions are met: | |
11 | * Redistributions in binary form must reproduce the above copyright notice, | 9 | // |
12 | this list of conditions and the following disclaimer in the documentation | 10 | // * Redistributions of source code must retain the above copyright notice, |
13 | and/or other materials provided with the distribution. | 11 | // this list of conditions and the following disclaimer. |
14 | 12 | // | |
15 | * Neither the name of Motorola Mobility LLC nor the names of its | 13 | // * Redistributions in binary form must reproduce the above copyright notice, |
16 | contributors may be used to endorse or promote products derived from this | 14 | // this list of conditions and the following disclaimer in the documentation |
17 | software without specific prior written permission. | 15 | // and/or other materials provided with the distribution. |
18 | 16 | // | |
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 17 | // * Neither the name of Motorola Mobility LLC nor the names of its |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 18 | // contributors may be used to endorse or promote products derived from this |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 19 | // software without specific prior written permission. |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | 20 | // |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 21 | // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 22 | // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 23 | // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 24 | // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 25 | // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
29 | POSSIBILITY OF SUCH DAMAGE. | 27 | // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
30 | </copyright> */ | 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> | ||
31 | 33 | ||
32 | span.css-at {color: #708;} | 34 | span.css-at {color: #708;} |
33 | 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 fde53226..ea9ba9b2 100755 --- a/scss/imports/codemirror/_javascript.scss +++ b/scss/imports/codemirror/_javascript.scss | |||
@@ -1,33 +1,35 @@ | |||
1 | /* <copyright> | 1 | @charset "UTF-8"; |
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | 2 | ||
5 | Redistribution and use in source and binary forms, with or without | 3 | // <copyright> |
6 | modification, are permitted provided that the following conditions are met: | 4 | // Copyright (c) 2012, Motorola Mobility LLC. |
7 | 5 | // All Rights Reserved. | |
8 | * Redistributions of source code must retain the above copyright notice, | 6 | // |
9 | this list of conditions and the following disclaimer. | 7 | // Redistribution and use in source and binary forms, with or without |
10 | 8 | // modification, are permitted provided that the following conditions are met: | |
11 | * Redistributions in binary form must reproduce the above copyright notice, | 9 | // |
12 | this list of conditions and the following disclaimer in the documentation | 10 | // * Redistributions of source code must retain the above copyright notice, |
13 | and/or other materials provided with the distribution. | 11 | // this list of conditions and the following disclaimer. |
14 | 12 | // | |
15 | * Neither the name of Motorola Mobility LLC nor the names of its | 13 | // * Redistributions in binary form must reproduce the above copyright notice, |
16 | contributors may be used to endorse or promote products derived from this | 14 | // this list of conditions and the following disclaimer in the documentation |
17 | software without specific prior written permission. | 15 | // and/or other materials provided with the distribution. |
18 | 16 | // | |
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 17 | // * Neither the name of Motorola Mobility LLC nor the names of its |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 18 | // contributors may be used to endorse or promote products derived from this |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 19 | // software without specific prior written permission. |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | 20 | // |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 21 | // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 22 | // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 23 | // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 24 | // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 25 | // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
29 | POSSIBILITY OF SUCH DAMAGE. | 27 | // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
30 | </copyright> */ | 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> | ||
31 | 33 | ||
32 | span.js-keyword {color: #90b;} | 34 | span.js-keyword {color: #90b;} |
33 | 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 1e46f6a5..7ceb3ab0 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss | |||
@@ -1,33 +1,35 @@ | |||
1 | // <copyright> | 1 | @charset "UTF-8"; |
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | |||
5 | Redistribution and use in source and binary forms, with or without | ||
6 | modification, are permitted provided that the following conditions are met: | ||
7 | |||