aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorKruti Shah2012-07-17 12:40:00 -0700
committerKruti Shah2012-07-17 12:40:00 -0700
commitbf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /js/panels/Timeline/Layer.reel/scss
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parentb4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff)
downloadninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss217
1 files changed, 109 insertions, 108 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index cf8def42..2d4d00e0 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,26 +1,27 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright> 3/* <copyright>
4Copyright (c) 2012, Motorola Mobility, Inc 4Copyright (c) 2012, Motorola Mobility LLC.
5All Rights Reserved. 5All Rights Reserved.
6BSD License.
7 6
8Redistribution and use in source and binary forms, with or without 7Redistribution and use in source and binary forms, with or without
9modification, are permitted provided that the following conditions are met: 8modification, are permitted provided that the following conditions are met:
10 9
11 - Redistributions of source code must retain the above copyright notice, 10* Redistributions of source code must retain the above copyright notice,
12 this list of conditions and the following disclaimer. 11 this list of conditions and the following disclaimer.
13 - Redistributions in binary form must reproduce the above copyright 12
14 notice, this list of conditions and the following disclaimer in the 13* Redistributions in binary form must reproduce the above copyright notice,
15 documentation and/or other materials provided with the distribution. 14 this list of conditions and the following disclaimer in the documentation
16 - Neither the name of Motorola Mobility nor the names of its contributors 15 and/or other materials provided with the distribution.
17 may be used to endorse or promote products derived from this software 16
18 without specific prior written permission. 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.
19 20
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 21THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 24ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -33,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* Layer.scss 34/* Layer.scss
34 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 35 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
35 */ 36 */
36 37
37// Import theme settings 38// Import theme settings
38@import "../../../../../scss/imports/themes/default/colors"; 39@import "../../../../../scss/imports/themes/default/colors";
39// @import "../../../../../scss/imports/themes/default/fonts"; 40// @import "../../../../../scss/imports/themes/default/fonts";
@@ -54,8 +55,8 @@ POSSIBILITY OF SUCH DAMAGE.
54 -webkit-box-orient: horizontal; 55 -webkit-box-orient: horizontal;
55} 56}
56.layerLabel.layerSelected { 57.layerLabel.layerSelected {
57 background-color: $color-panel-hilite-bg; 58 background-color: $color-panel-hilite-bg;
58 color: $color-panel-hilite-text; 59 color: $color-panel-hilite-text;
59} 60}
60.layerLabel{ 61.layerLabel{
61 width:100%; 62 width:100%;
@@ -100,208 +101,208 @@ POSSIBILITY OF SUCH DAMAGE.
100 101
101.container-layer, 102.container-layer,
102.container-layer.selected { 103.container-layer.selected {
103 background-color: $color-panel-bg; 104 background-color: $color-panel-bg;
104 color: $color-panel-text; 105 color: $color-panel-text;
105 font-size: 12px; 106 font-size: 12px;
106 text-shadow: 1px 1px 1px $color-app-shadow; 107 text-shadow: 1px 1px 1px $color-app-shadow;
107} 108}
108.selected .container-layer { 109.selected .container-layer {
109 background-color: $color-panel-bg; 110 background-color: $color-panel-bg;
110} 111}
111.selected .container-layer .label-layer { 112.selected .container-layer .label-layer {
112 background-color: $color-panel-hilite-bg; 113 background-color: $color-panel-hilite-bg;
113 color: $color-panel-hilite-text; 114 color: $color-panel-hilite-text;
114} 115}
115 116
116.userlayers .collapsible-label { 117.userlayers .collapsible-label {
117 display: block; 118 display: block;
118 height: 21px; 119 height: 21px;
119 line-height: 20px; 120 line-height: 20px;
120 color: $color-panel-text; 121 color: $color-panel-text;
121 margin-left: 80px; 122 margin-left: 80px;
122 margin-right: 40px; 123 margin-right: 40px;
123 white-space: nowrap; 124 white-space: nowrap;
124 overflow: hidden; 125 overflow: hidden;
125 text-overflow: ellipsis; 126 text-overflow: ellipsis;
126} 127}
127 128
128.userlayers .layer-tag { 129.userlayers .layer-tag {
129 position: absolute; 130 position: absolute;
130 top: 3px; 131 top: 3px;
131 left: 20px; 132 left: 20px;
132} 133}
133 134
134 135
135.layerSelected .label-layer { 136.layerSelected .label-layer {
136 background-color: $color-menu-hilite-bg; 137 background-color: $color-menu-hilite-bg;
137 color: $color-panel-hilite-text; 138 color: $color-panel-hilite-text;
138} 139}
139.content-layer { 140.content-layer {
140 background-color: $color-panel-bg; 141 background-color: $color-panel-bg;
141 color: $color-panel-text; 142 color: $color-panel-text;
142} 143}
143.content-layer .collapsible-label { 144.content-layer .collapsible-label {
144 background-position: 14px 5px; 145 background-position: 14px 5px;
145 border-width: 0px; 146 border-width: 0px;
146} 147}
147.label-layer, 148.label-layer,
148.label-position, 149.label-position,
149.label-transform, 150.label-transform,
150.label-style, 151.label-style,
151.label-styles { 152.label-styles {
152 position: relative; 153 position: relative;
153 border-bottom: 1px solid #505050; 154 border-bottom: 1px solid #505050;
154 cursor: pointer; 155 cursor: pointer;
155} 156}
156 157
157.content-layer .collapsible-label, 158.content-layer .collapsible-label,
158.content-layer .collapsible-content, 159.content-layer .collapsible-content,
159.content-layer .layer-tag { 160.content-layer .layer-tag {
160 font-size: 11px; 161 font-size: 11px;
161} 162}
162 163
163 164
164 165
165.label-layer .collapsible-label br, 166.label-layer .collapsible-label br,
166.content-style .editable br { 167.content-style .editable br {
167 display: none; 168 display: none;
168} 169}
169 170
170.collapsible-clicker { 171.collapsible-clicker {
171 position: absolute; 172 position: absolute;
172 width: 10px; 173 width: 10px;
173 height: 10px; 174 height: 10px;
174 top: 5px; 175 top: 5px;
175 left: 5px; 176 left: 5px;
176 margin: 0px; 177 margin: 0px;
177 padding: 0px; 178 padding: 0px;
178 background-image: url(../images/icon-open.png); 179 background-image: url(../images/icon-open.png);
179 background-repeat: no-repeat; 180 background-repeat: no-repeat;
180} 181}
181.collapsible-clicker.collapsible-collapsed { 182.collapsible-clicker.collapsible-collapsed {
182 background-image: url(../images/icon-collapsed.png); 183 background-image: url(../images/icon-collapsed.png);
183} 184}
184.collapsible-content .collapsible-clicker { 185.collapsible-content .collapsible-clicker {
185 left: 12px; 186 left: 12px;
186} 187}
187.container-layer .collapsible-content.collapsible-collapsed { 188.container-layer .collapsible-content.collapsible-collapsed {
188 height: 0px; 189 height: 0px;
189 overflow: hidden; 190 overflow: hidden;
190} 191}
191 192
192.label-layer .cssbutton, 193.label-layer .cssbutton,
193.label-style .cssbutton { 194.label-style .cssbutton {
194 width: 14px; 195 width: 14px;
195 height: 14px; 196 height: 14px;