aboutsummaryrefslogtreecommitdiff
path: root/scss/imports/themes
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /scss/imports/themes
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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 js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'scss/imports/themes')
-rwxr-xr-xscss/imports/themes/_test.scss73
-rwxr-xr-xscss/imports/themes/default/_colors.scss105
-rwxr-xr-xscss/imports/themes/default/_fonts.scss59
-rwxr-xr-xscss/imports/themes/default/_mixins.scss59
4 files changed, 154 insertions, 142 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 0767c300..0c634bee 100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
@@ -1,32 +1,35 @@
1// <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility, Inc
3All Rights Reserved.
4BSD License.
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 2
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 3// <copyright>
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 4// Copyright (c) 2012, Motorola Mobility LLC.
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 5// All Rights Reserved.
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 6//
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 7// Redistribution and use in source and binary forms, with or without
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 8// modification, are permitted provided that the following conditions are met:
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 9//
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 10// * Redistributions of source code must retain the above copyright notice,
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 11// this list of conditions and the following disclaimer.
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 12//
28POSSIBILITY OF SUCH DAMAGE. 13// * Redistributions in binary form must reproduce the above copyright notice,
29</copyright> 14// this list of conditions and the following disclaimer in the documentation
15// and/or other materials provided with the distribution.
16//
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
19// software without specific prior written permission.
20//
21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
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>
30 33
31/* 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 */
32.applicationBodyBackground { 35.applicationBodyBackground {
@@ -39,13 +42,13 @@ POSSIBILITY OF SUCH DAMAGE.
39} 42}
40 43
41.docAreaBackground { 44.docAreaBackground {
42 color: black; 45 color: black;
43 background: black; 46 background: black;
44} 47}
45 48
46.mainStageBackground { 49.mainStageBackground {
47 color: white; 50 color: white;
48 background: gray; 51 background: gray;
49} 52}
50 53
51.stageContentShadow { 54.stageContentShadow {
@@ -55,9 +58,9 @@ POSSIBILITY OF SUCH DAMAGE.
55} 58}
56 59
57.panelBackground { 60.panelBackground {
58 color: white; 61 color: white;
59 /*border: solid 1px #333;*/ 62 /*border: solid 1px #333;*/
60 background: rgba(41,41,41,1); 63 background: rgba(41,41,41,1);
61} 64}
62 65
63.panelCollapseControlBackground { 66.panelCollapseControlBackground {
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index d22cb29a..60726263 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -1,32 +1,35 @@
1// <copyright> 1@charset "UTF-8";
2Copyright (c) 2012, Motorola Mobility, Inc
3All Rights Reserved.
4BSD License.
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 2
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 3// <copyright>
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 4// Copyright (c) 2012, Motorola Mobility LLC.
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 5// All Rights Reserved.
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 6//
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 7// Redistribution and use in source and binary forms, with or without
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 8// modification, are permitted provided that the following conditions are met:
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 9//
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 10// * Redistributions of source code must retain the above copyright notice,
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 11// this list of conditions and the following disclaimer.
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 12//
28POSSIBILITY OF SUCH DAMAGE. 13// * Redistributions in binary form must reproduce the above copyright notice,
29</copyright> 14// this list of conditions and the following disclaimer in the documentation
15// and/or other materials provided with the distribution.
16//
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
19// software without specific prior written permission.
20//
21// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
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>
30 33
31//_colors.scss 34//_colors.scss
32//Defines the colors for the UI of the application. 35//Defines the colors for the UI of the application.
@@ -34,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
34//Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. 37//Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
35 38
36 39
37// Colors for radio buttons and other form elements 40// Colors for radio buttons and other form elements
38$color-radio-border: rgb(40,40,40); 41$color-radio-border: rgb(40,40,40);
39$color-radio-shadow: rgba(200,200,200,0.5); 42$color-radio-shadow: rgba(200,200,200,0.5);
40$color-radio-gradient-top: rgb(100,100,100); 43$color-radio-gradient-top: rgb(100,100,100);
@@ -49,27 +52,27 @@ $color-input-border: rgb(49, 49, 49);
49$color-focus-outline: rgb(180, 180, 180); 52$color-focus-outline: rgb(180, 180, 180);
50$color-transparent: rgba(0,0,0,0); 53$color-transparent: rgba(0,0,0,0);
51 54
52// Base colors for dividers 55// Base colors for dividers
53// Dividers consist of a div with a background color and either 56// Dividers consist of a div with a background color and either
54// a top & bottom border (in the case of horizontal dividers) 57// a top & bottom border (in the case of horizontal dividers)
55// or a left & right border (in the case of vertical dividers), 58// or a left & right border (in the case of vertical dividers),
56// for a total of three different colors. 59// for a total of three different colors.
57// 60//
58 61
59$color-divider-first: rgb(35,35,35); // top and left 62$color-divider-first: rgb(35,35,35); // top and left
60$color-divider-second: rgb(0,0,0); // Middle 63$color-divider-second: rgb(0,0,0); // Middle
61$color-divider-third: rgb(58,58,58); // Bottom and right 64$color-divider-third: rgb(58,58,58); // Bottom and right
62 65
63// Main background color of entire app 66// Main background color of entire app
64$color-app-bg: rgb(0,0,0); // Main app background color. 67$color-app-bg: rgb(0,0,0); // Main app background color.
65$color-app-bg-a1: rgba(0,0,0,1); // rgba version 68$color-app-bg-a1: rgba(0,0,0,1); // rgba version
66$color-app-border: rgb(51,51,51); // Main app border color 69$color-app-border: rgb(51,51,51); // Main app border color
67$color-app-shadow: rgba(0,0,0,.5); // color of drop shadows 70$color-app-shadow: rgba(0,0,0,.5); // color of drop shadows
68$color-stage: rgb(128,128,128); // Stage color 71$color-stage: rgb(128,128,128); // Stage color
69$color-body-border: rgb(0,0,0); // body border color 72$color-body-border: rgb(0,0,0); // body border color
70$color-body-bg: rgb(255,255,255); // Body background color 73$color-body-bg: rgb(255,255,255); // Body background color
71 74
72// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers 75// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers
73$color-menu-bg: rgb(71,71,71); 76$color-menu-bg: rgb(71,71,71);
74$color-menu-text: rgb(255,255,255);