aboutsummaryrefslogtreecommitdiff
path: root/scss/imports/themes
diff options
context:
space:
mode:
authorKruti Shah2012-07-09 11:27:16 -0700
committerKruti Shah2012-07-09 11:27:16 -0700
commit5ad509e46add1b45d15d1c493e18a5c52a462654 (patch)
tree93cd416cd7060e3688f33545f70956f787f6886f /scss/imports/themes
parent6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff)
parent39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
downloadninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode
Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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 Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'scss/imports/themes')
-rwxr-xr-xscss/imports/themes/_test.scss34
-rwxr-xr-xscss/imports/themes/default/_colors.scss32
-rwxr-xr-xscss/imports/themes/default/_fonts.scss32
-rwxr-xr-xscss/imports/themes/default/_mixins.scss32
4 files changed, 113 insertions, 17 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 87735bec..0767c300 100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
@@ -1,8 +1,32 @@
1// <copyright> 1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5// </copyright> 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,
10 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright
12 notice, this list of conditions and the following disclaimer in the
13 documentation and/or other materials provided with the distribution.
14 - Neither the name of Motorola Mobility nor the names of its contributors
15 may be used to endorse or promote products derived from this software
16 without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright>
6 30
7/* extra theme for use when developing the layouts so we can color items to discern them */ 31/* extra theme for use when developing the layouts so we can color items to discern them */
8.applicationBodyBackground { 32.applicationBodyBackground {
@@ -52,4 +76,4 @@
52.panelContent { 76.panelContent {
53 background: rgba(62,62,62,1); 77 background: rgba(62,62,62,1);
54 border: solid 1px black; 78 border: solid 1px black;
55} \ No newline at end of file 79}
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index 2a7b8191..d22cb29a 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -1,8 +1,32 @@
1// <copyright> 1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5// </copyright> 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,
10 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright
12 notice, this list of conditions and the following disclaimer in the
13 documentation and/or other materials provided with the distribution.
14 - Neither the name of Motorola Mobility nor the names of its contributors
15 may be used to endorse or promote products derived from this software
16 without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright>
6 30
7//_colors.scss 31//_colors.scss
8//Defines the colors for the UI of the application. 32//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 9174cff3..0e0c15ca 100755
--- a/scss/imports/themes/default/_fonts.scss
+++ b/scss/imports/themes/default/_fonts.scss
@@ -1,7 +1,31 @@
1// <copyright> 1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5// </copyright> 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,
10 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright
12 notice, this list of conditions and the following disclaimer in the
13 documentation and/or other materials provided with the distribution.
14 - Neither the name of Motorola Mobility nor the names of its contributors
15 may be used to endorse or promote products derived from this software
16 without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright>
6 30
7 31
diff --git a/scss/imports/themes/default/_mixins.scss b/scss/imports/themes/default/_mixins.scss
index 9f61e7ef..049e8cf3 100755
--- a/scss/imports/themes/default/_mixins.scss
+++ b/scss/imports/themes/default/_mixins.scss
@@ -1,8 +1,32 @@
1// <copyright> 1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5// </copyright> 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,
10 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright
12 notice, this list of conditions and the following disclaimer in the
13 documentation and/or other materials provided with the distribution.
14 - Neither the name of Motorola Mobility nor the names of its contributors
15 may be used to endorse or promote products derived from this software
16 without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright>
6 30
7// themes/themename/mixins.scss 31// themes/themename/mixins.scss
8// Mixins that are theme-dependent (e.g. sprite mixins, etc) 32// Mixins that are theme-dependent (e.g. sprite mixins, etc)