aboutsummaryrefslogtreecommitdiff
path: root/scss/imports/themes
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-16 13:15:27 -0700
committerValerio Virgillito2012-07-16 13:15:27 -0700
commitfe1e956b527c2cf4ecf10645810f3ff750e9e522 (patch)
tree2cde04bfd925092c30cedabebad2d247c69c373d /scss/imports/themes
parent289e821c819d0fded21b97ec6e4ed27dd6f30ab4 (diff)
parent156f15cec3203528a78783d075d4b8f1eb40c06d (diff)
downloadninja-fe1e956b527c2cf4ecf10645810f3ff750e9e522.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'scss/imports/themes')
-rwxr-xr-xscss/imports/themes/_test.scss60
-rwxr-xr-xscss/imports/themes/default/_colors.scss60
-rwxr-xr-xscss/imports/themes/default/_fonts.scss60
-rwxr-xr-xscss/imports/themes/default/_mixins.scss60
4 files changed, 124 insertions, 116 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index e29341f8..0c634bee 100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
@@ -1,33 +1,35 @@
1// <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10 2
11* Redistributions in binary form must reproduce the above copyright notice, 3// <copyright>
12 this list of conditions and the following disclaimer in the documentation 4// Copyright (c) 2012, Motorola Mobility LLC.
13 and/or other materials provided with the distribution. 5// All Rights Reserved.
14 6//
15* Neither the name of Motorola Mobility LLC nor the names of its 7// Redistribution and use in source and binary forms, with or without
16 contributors may be used to endorse or promote products derived from this 8// modification, are permitted provided that the following conditions are met:
17 software without specific prior written permission. 9//
18 10// * Redistributions of source code must retain the above copyright notice,
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 11// this list of conditions and the following disclaimer.
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 12//
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 13// * Redistributions in binary form must reproduce the above copyright notice,
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 14// this list of conditions and the following disclaimer in the documentation
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 15// and/or other materials provided with the distribution.
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 16//
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 17// * Neither the name of Motorola Mobility LLC nor the names of its
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 18// contributors may be used to endorse or promote products derived from this
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 19// software without specific prior written permission.
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 20//
29POSSIBILITY OF SUCH DAMAGE. 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
30</copyright> 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
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>
31 33
32/* extra theme for use when developing the layouts so we can color items to discern them */ 34/* extra theme for use when developing the layouts so we can color items to discern them */
33.applicationBodyBackground { 35.applicationBodyBackground {
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index 8f99a175..60726263 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -1,33 +1,35 @@
1// <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10 2
11* Redistributions in binary form must reproduce the above copyright notice, 3// <copyright>
12 this list of conditions and the following disclaimer in the documentation 4// Copyright (c) 2012, Motorola Mobility LLC.
13 and/or other materials provided with the distribution. 5// All Rights Reserved.
14 6//
15* Neither the name of Motorola Mobility LLC nor the names of its 7// Redistribution and use in source and binary forms, with or without
16 contributors may be used to endorse or promote products derived from this 8// modification, are permitted provided that the following conditions are met:
17 software without specific prior written permission. 9//
18 10// * Redistributions of source code must retain the above copyright notice,
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 11// this list of conditions and the following disclaimer.
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 12//
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 13// * Redistributions in binary form must reproduce the above copyright notice,
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 14// this list of conditions and the following disclaimer in the documentation
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 15// and/or other materials provided with the distribution.
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 16//
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 17// * Neither the name of Motorola Mobility LLC nor the names of its
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 18// contributors may be used to endorse or promote products derived from this
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 19// software without specific prior written permission.
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 20//
29POSSIBILITY OF SUCH DAMAGE. 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
30</copyright> 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
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>
31 33
32//_colors.scss 34//_colors.scss
33//Defines the colors for the UI of the application. 35//Defines the colors for the UI of the application.
diff --git a/scss/imports/themes/default/_fonts.scss b/scss/imports/themes/default/_fonts.scss
index 0aa3c482..a7705542 100755
--- a/scss/imports/themes/default/_fonts.scss
+++ b/scss/imports/themes/default/_fonts.scss
@@ -1,32 +1,34 @@
1// <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
8* Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer.
10 2
11* Redistributions in binary form must reproduce the above copyright notice, 3// <copyright>
12 this list of conditions and the following disclaimer in the documentation 4// Copyright (c) 2012, Motorola Mobility LLC.
13 and/or other materials provided with the distribution. 5// All Rights Reserved.
14 6//
15* Neither the name of Motorola Mobility LLC nor the names of its 7// Redistribution and use in source and binary forms, with or without
16 contributors may be used to endorse or promote products derived from this 8// modification, are permitted provided that the following conditions are met:
17 software without specific prior written permission. 9//
18 10// * Redistributions of source code must retain the above copyright notice,
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 11// this list of conditions and the following disclaimer.
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 12//
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 13// * Redistributions in binary form must reproduce the above copyright notice,
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 14// this list of conditions and the following disclaimer in the documentation
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 15// and/or other materials provided with the distribution.
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 16//
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 17// * Neither the name of Motorola Mobility LLC nor the names of its
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 18// contributors may be used to endorse or promote products derived from this
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 19// software without specific prior written permission.
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 20//
29POSSIBILITY OF SUCH DAMAGE. 21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
30</copyright> 22// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
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>
31 33
32 34
diff --git a/scss/imports/themes/default/_mixins.scss b/scss/imports/themes/default/_mixins.scss
index 1d2bdca7..860f845d 100755
--- a/scss/imports/themes/default/_mixins.scss
+++ b/scss/imports/themes/default/_mixins.scss
@@ -1,33 +1,35 @@
1@charset "UTF-8";
2
1// <copyright> 3// <copyright>
2Copyright (c) 2012, Motorola Mobility LLC. 4// Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 5// All Rights Reserved.
4 6//
5Redistribution and use in source and binary forms, with or without 7// Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met: 8// modification, are permitted provided that the following conditions are met:
7 9//
8* Redistributions of source code must retain the above copyright notice, 10// * Redistributions of source code must retain the above copyright notice,
9 this list of conditions and the following disclaimer. 11// this list of conditions and the following disclaimer.
10 12//
11* Redistributions in binary form must reproduce the above copyright notice, 13// * Redistributions in binary form must reproduce the above copyright notice,
12 this list of conditions and the following disclaimer in the documentation 14// this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution. 15// and/or other materials provided with the distribution.
14 16//
15* 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
16 contributors may be used to endorse or promote products derived from this 18//