diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/Timeline/Style.reel/css/Style.css | 79 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 3 |
2 files changed, 19 insertions, 63 deletions
diff --git a/js/panels/Timeline/Style.reel/css/Style.css b/js/panels/Timeline/Style.reel/css/Style.css index 6c7542cb..0cc8a1f8 100644 --- a/js/panels/Timeline/Style.reel/css/Style.css +++ b/js/panels/Timeline/Style.reel/css/Style.css | |||
@@ -1,88 +1,36 @@ | |||
1 | /* Layer.scss | ||
2 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | ||
3 | */ | ||
4 | /* <copyright> | 1 | /* <copyright> |
5 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
6 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
7 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
8 | </copyright> */ | 5 | </copyright> */ |
9 | /* | 6 | /* Layer.scss |
10 | * _colors.scss | 7 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
11 | * Defines the colors for the UI of the application. | ||
12 | * To create a new theme, copy this file and change the values as desired. | ||
13 | * Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. | ||
14 | */ | ||
15 | /* Colors for radio buttons and other form elements */ | ||
16 | /* Base colors for dividers | ||
17 | * | ||
18 | * Dividers consist of a div with a background color and either | ||
19 | * a top & bottom border (in the case of horizontal dividers) | ||
20 | * or a left & right border (in the case of vertical dividers), | ||
21 | * for a total of three different colors. | ||
22 | * | ||
23 | */ | ||
24 | /* top and left */ | ||
25 | /* Middle */ | ||
26 | /* Bottom and right */ | ||
27 | /* Main background color of entire app */ | ||
28 | /* Main app background color. */ | ||
29 | /* rgba version */ | ||
30 | /* Main app border color */ | ||
31 | /* color of drop shadows */ | ||
32 | /* Stage color */ | ||
33 | /* body border color */ | ||
34 | /* Body background color */ | ||
35 | /* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */ | ||
36 | /* Colors for tools: background, text, how they interact with the UI */ | ||
37 | /* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */ | ||
38 | /* used for editable items in their non-edit state, etc. */ | ||
39 | /* Border for panel and for block elements */ | ||
40 | /* Shadow for text and block elements */ | ||
41 | /* Colors for scroll bars */ | ||
42 | /* <copyright> | ||
43 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
44 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
45 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
46 | </copyright> */ | ||
47 | /* | ||
48 | * themes/themename/mixins.scss | ||
49 | * Mixins that are theme-dependent (e.g. sprite mixins, etc) | ||
50 | */ | ||
51 | /* <copyright> | ||
52 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
53 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
54 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
55 | </copyright> */ | ||
56 | /* | ||
57 | * mixins.scss | ||
58 | * Generic mixins. Theme-specific mixins (e.g. for sprites) | ||
59 | * should go in the theme/themename/mixins.scss file. | ||
60 | */ | 8 | */ |
61 | /* line 12, ../scss/Style.scss */ | 9 | /* line 18, ../scss/Style.scss */ |
62 | .hidden { | 10 | .hidden { |
63 | display: none; | 11 | display: none; |
64 | } | 12 | } |
65 | 13 | ||
66 | /* line 15, ../scss/Style.scss */ | 14 | /* line 21, ../scss/Style.scss */ |
67 | .row-editor { | 15 | .row-editor { |
68 | position: relative; | 16 | position: relative; |
69 | height: 14px; | 17 | height: 14px; |
70 | } | 18 | } |
71 | 19 | ||
72 | /* line 19, ../scss/Style.scss */ | 20 | /* line 25, ../scss/Style.scss */ |
73 | .style-padding { | 21 | .style-padding { |
74 | padding-left: 5px; | 22 | padding-left: 5px; |
75 | padding-top: 3px; | 23 | padding-top: 3px; |
76 | padding-right: 5px; | 24 | padding-right: 5px; |
77 | } | 25 | } |
78 | 26 | ||
79 | /* line 24, ../scss/Style.scss */ | 27 | /* line 30, ../scss/Style.scss */ |
80 | .style-row { | 28 | .style-row { |
81 | height: 20px; | 29 | height: 20px; |
82 | border-bottom: 1px solid #505050; | 30 | border-bottom: 1px solid #505050; |
83 | } | 31 | } |
84 | 32 | ||
85 | /* line 29, ../scss/Style.scss */ | 33 | /* line 35, ../scss/Style.scss */ |
86 | div.content-style div.editable2 { | 34 | div.content-style div.editable2 { |
87 | height: 14px; | 35 | height: 14px; |
88 | background-color: #242424 !important; | 36 | background-color: #242424 !important; |
@@ -96,7 +44,7 @@ div.content-style div.editable2 { | |||
96 | width: 100%; | 44 | width: 100%; |
97 | } | 45 | } |
98 | 46 | ||
99 | /* line 43, ../scss/Style.scss */ | 47 | /* line 49, ../scss/Style.scss */ |
100 | .content-style.collapsible-content, | 48 | .content-style.collapsible-content, |
101 | .content-style.collapsible-content div, | 49 | .content-style.collapsible-content div, |
102 | .content-style.collapsible-content span { | 50 | .content-style.collapsible-content span { |
@@ -104,7 +52,7 @@ div.content-style div.editable2 { | |||
104 | text-overflow: visible; | 52 | text-overflow: visible; |
105 | } | 53 | } |
106 | 54 | ||
107 | /* line 48, ../scss/Style.scss */ | 55 | /* line 54, ../scss/Style.scss */ |
108 | div.content-style div.cell-property, | 56 | div.content-style div.cell-property, |
109 | div.content-style div.cell-value { | 57 | div.content-style div.cell-value { |
110 | width: 45%; | 58 | width: 45%; |
@@ -116,7 +64,7 @@ div.content-style div.cell-value { | |||
116 | line-height: 18px; | 64 | line-height: 18px; |
117 | } | 65 | } |
118 | 66 | ||
119 | /* line 57, ../scss/Style.scss */ | 67 | /* line 63, ../scss/Style.scss */ |
120 | div.content-style div.cell-property div { | 68 | div.content-style div.cell-property div { |
121 | min-width: 90%; | 69 | min-width: 90%; |
122 | height: 100%; | 70 | height: 100%; |
@@ -125,9 +73,14 @@ div.content-style div.cell-property div { | |||
125 | white-space: nowrap; | 73 | white-space: nowrap; |
126 | } | 74 | } |
127 | 75 | ||
128 | /* line 65, ../scss/Style.scss */ | 76 | /* line 71, ../scss/Style.scss */ |
129 | div.content-style input.nj-skinned { | 77 | div.content-style input.nj-skinned { |
130 | height: 10px; | 78 | height: 10px; |
131 | font-size: 12px; | 79 | font-size: 12px; |
132 | top: -3px; | 80 | top: -3px; |
133 | } | 81 | } |
82 | |||
83 | /* line 76, ../scss/Style.scss */ | ||
84 | div.style-row .container-propvals { | ||
85 | overflow: hidden; | ||
86 | } | ||
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 30bf43fe..66028cbe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
@@ -73,4 +73,7 @@ div.content-style input.nj-skinned { | |||
73 | font-size: 12px; | 73 | font-size: 12px; |
74 | top: -3px; | 74 | top: -3px; |
75 | } | 75 | } |
76 | div.style-row .container-propvals { | ||
77 | overflow: hidden; | ||
78 | } | ||
76 | 79 | ||