aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-16 13:03:01 -0700
committerJohn Mayhew2012-07-16 13:03:01 -0700
commit208dc8fad9d6293d067946dcd7603aae718b0d4e (patch)
tree736001aa47dfe336e145b18fe880a10688060753
parent2bde2da1e95779f52e5f7cd675cb1e8d2e011cc7 (diff)
downloadninja-208dc8fad9d6293d067946dcd7603aae718b0d4e.tar.gz
Added back one copyright block so it is properly included in the ninja.css output file from SASS
-rwxr-xr-xcss/ninja.css25
-rwxr-xr-xscss/ninja.scss60
2 files changed, 55 insertions, 30 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 4cf58c21..288156b6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -1,4 +1,29 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2/* <copyright>
3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8
9* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10
11* 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.
12
13* 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.
14
15THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
16AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
19LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25POSSIBILITY OF SUCH DAMAGE.
26</copyright> */
2.clear { display: block; clear: both; height: 0px; overflow: hidden; } 27.clear { display: block; clear: both; height: 0px; overflow: hidden; }
3 28
4.bold { font-weight: bold; } 29.bold { font-weight: bold; }
diff --git a/scss/ninja.scss b/scss/ninja.scss
index 10c02cb5..2601f87d 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -1,35 +1,35 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3// <copyright> 3/* <copyright>
4// Copyright (c) 2012, Motorola Mobility LLC. 4Copyright (c) 2012, Motorola Mobility LLC.
5// All Rights Reserved. 5All Rights Reserved.
6// 6
7// Redistribution and use in source and binary forms, with or without 7Redistribution and use in source and binary forms, with or without
8// modification, are permitted provided that the following conditions are met: 8modification, are permitted provided that the following conditions are met:
9// 9
10// * Redistributions of source code must retain the above copyright notice, 10* Redistributions of source code must retain the above copyright notice,
11// this list of conditions and the following disclaimer. 11 this list of conditions and the following disclaimer.
12// 12
13// * Redistributions in binary form must reproduce the above copyright notice, 13* Redistributions in binary form must reproduce the above copyright notice,
14// this list of conditions and the following disclaimer in the documentation 14 this list of conditions and the following disclaimer in the documentation
15// and/or other materials provided with the distribution. 15 and/or other materials provided with the distribution.
16// 16
17// * Neither the name of Motorola Mobility LLC nor the names of its 17* Neither the name of Motorola Mobility LLC nor the names of its
18// contributors may be used to endorse or promote products derived from this 18 contributors may be used to endorse or promote products derived from this
19// software without specific prior written permission. 19 software without specific prior written permission.
20// 20
21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 21THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 24ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29CONTRACT, 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 30ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31// POSSIBILITY OF SUCH DAMAGE. 31POSSIBILITY OF SUCH DAMAGE.
32// </copyright> 32</copyright> */
33 33
34 34
35// ninja.scss 35// ninja.scss