diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/panels/Timeline/Layer.reel/css/Layer.css | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels/Timeline/Layer.reel/css/Layer.css')
-rw-r--r-- | js/panels/Timeline/Layer.reel/css/Layer.css | 99 |
1 files changed, 71 insertions, 28 deletions
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css index 8e36c2db..179571af 100644 --- a/js/panels/Timeline/Layer.reel/css/Layer.css +++ b/js/panels/Timeline/Layer.reel/css/Layer.css | |||
@@ -93,36 +93,42 @@ | |||
93 | /* line 91, ../scss/Layer.scss */ | 93 | /* line 91, ../scss/Layer.scss */ |
94 | .userlayers .collapsible-label { | 94 | .userlayers .collapsible-label { |
95 | display: block; | 95 | display: block; |
96 | width: 100px; | ||
97 | height: 21px; | 96 | height: 21px; |
98 | line-height: 20px; | 97 | line-height: 20px; |
99 | color: white; | 98 | color: white; |
100 | margin-left: 30px; | 99 | margin-left: 80px; |
101 | margin-right: 20px; | 100 | margin-right: 40px; |
102 | white-space: nowrap; | 101 | white-space: nowrap; |
103 | overflow: hidden; | 102 | overflow: hidden; |
104 | text-overflow: ellipsis; | 103 | text-overflow: ellipsis; |
105 | } | 104 | } |
106 | 105 | ||
107 | /* line 103, ../scss/Layer.scss */ | 106 | /* line 103, ../scss/Layer.scss */ |
107 | .userlayers .layer-tag { | ||
108 | position: absolute; | ||
109 | top: 3px; | ||
110 | left: 20px; | ||
111 | } | ||
112 | |||
113 | /* line 110, ../scss/Layer.scss */ | ||
108 | .layerSelected .label-layer { | 114 | .layerSelected .label-layer { |
109 | background-color: #b2b2b2; | 115 | background-color: #b2b2b2; |
110 | color: #242424; | 116 | color: #242424; |
111 | } | 117 | } |
112 | 118 | ||
113 | /* line 107, ../scss/Layer.scss */ | 119 | /* line 114, ../scss/Layer.scss */ |
114 | .content-layer { | 120 | .content-layer { |
115 | background-color: #474747; | 121 | background-color: #474747; |
116 | color: white; | 122 | color: white; |
117 | } | 123 | } |
118 | 124 | ||
119 | /* line 111, ../scss/Layer.scss */ | 125 | /* line 118, ../scss/Layer.scss */ |
120 | .content-layer .collapsible-label { | 126 | .content-layer .collapsible-label { |
121 | background-position: 14px 5px; | 127 | background-position: 14px 5px; |
122 | border-width: 0px; | 128 | border-width: 0px; |
123 | } | 129 | } |
124 | 130 | ||
125 | /* line 119, ../scss/Layer.scss */ | 131 | /* line 126, ../scss/Layer.scss */ |
126 | .label-layer, | 132 | .label-layer, |
127 | .label-position, | 133 | .label-position, |
128 | .label-transform, | 134 | .label-transform, |
@@ -133,13 +139,20 @@ | |||
133 | cursor: pointer; | 139 | cursor: pointer; |
134 | } | 140 | } |
135 | 141 | ||
136 | /* line 126, ../scss/Layer.scss */ | 142 | /* line 134, ../scss/Layer.scss */ |
137 | .content-layer .collapsible-label, | 143 | .content-layer .collapsible-label, |
138 | .content-layer .collapsible-content { | 144 | .content-layer .collapsible-content, |
145 | .content-layer .layer-tag { | ||
139 | font-size: 11px; | 146 | font-size: 11px; |
140 | } | 147 | } |
141 | 148 | ||
142 | /* line 130, ../scss/Layer.scss */ | 149 | /* line 141, ../scss/Layer.scss */ |
150 | .label-layer .collapsible-label br, | ||
151 | .content-style .editable br { | ||
152 | display: none; | ||
153 | } | ||
154 | |||
155 | /* line 145, ../scss/Layer.scss */ | ||
143 | .collapsible-clicker { | 156 | .collapsible-clicker { |
144 | position: absolute; | 157 | position: absolute; |
145 | width: 10px; | 158 | width: 10px; |
@@ -152,23 +165,23 @@ | |||
152 | background-repeat: no-repeat; | 165 | background-repeat: no-repeat; |
153 | } | 166 | } |
154 | 167 | ||
155 | /* line 141, ../scss/Layer.scss */ | 168 | /* line 156, ../scss/Layer.scss */ |
156 | .collapsible-clicker.collapsible-collapsed { | 169 | .collapsible-clicker.collapsible-collapsed { |
157 | background-image: url(../images/icon-collapsed.png); | 170 | background-image: url(../images/icon-collapsed.png); |
158 | } | 171 | } |
159 | 172 | ||
160 | /* line 144, ../scss/Layer.scss */ | 173 | /* line 159, ../scss/Layer.scss */ |
161 | .collapsible-content .collapsible-clicker { | 174 | .collapsible-content .collapsible-clicker { |
162 | left: 12px; | 175 | left: 12px; |
163 | } | 176 | } |
164 | 177 | ||
165 | /* line 147, ../scss/Layer.scss */ | 178 | /* line 162, ../scss/Layer.scss */ |
166 | .container-layer .collapsible-content.collapsible-collapsed { | 179 | .container-layer .collapsible-content.collapsible-collapsed { |
167 | height: 0px; | 180 | height: 0px; |
168 | overflow: hidden; | 181 | overflow: hidden; |
169 | } | 182 | } |
170 | 183 | ||
171 | /* line 153, ../scss/Layer.scss */ | 184 | /* line 168, ../scss/Layer.scss */ |
172 | .label-layer .cssbutton, | 185 | .label-layer .cssbutton, |
173 | .label-style .cssbutton { | 186 | .label-style .cssbutton { |
174 | width: 14px; | 187 | width: 14px; |
@@ -178,21 +191,21 @@ | |||
178 | background-repeat: no-repeat; | 191 | background-repeat: no-repeat; |
179 | } | 192 | } |
180 | 193 | ||
181 | /* line 160, ../scss/Layer.scss */ | 194 | /* line 175, ../scss/Layer.scss */ |
182 | .label-layer .button-lock { | 195 | .label-layer .button-lock { |
183 | background-image: url(../images/icon-lock.png); | 196 | background-image: url(../images/icon-lock.png); |
184 | top: 3px; | 197 | top: 3px; |
185 | right: 27px; | 198 | right: 27px; |
186 | } | 199 | } |
187 | 200 | ||
188 | /* line 165, ../scss/Layer.scss */ | 201 | /* line 180, ../scss/Layer.scss */ |
189 | .label-layer .button-visible { | 202 | .label-layer .button-visible { |
190 | background-image: url(../images/icon-eye.png); | 203 | background-image: url(../images/icon-eye.png); |
191 | top: 3px; | 204 | top: 3px; |
192 | right: 7px; | 205 | right: 7px; |
193 | } | 206 | } |
194 | 207 | ||
195 | /* line 170, ../scss/Layer.scss */ | 208 | /* line 185, ../scss/Layer.scss */ |
196 | .label-style .button-add { | 209 | .label-style .button-add { |
197 | background-image: url(../images/icon-plus.png); | 210 | background-image: url(../images/icon-plus.png); |
198 | width: 15px; | 211 | width: 15px; |
@@ -201,7 +214,7 @@ | |||
201 | right: 11px; | 214 | right: 11px; |
202 | } | 215 | } |
203 | 216 | ||
204 | /* line 177, ../scss/Layer.scss */ | 217 | /* line 192, ../scss/Layer.scss */ |
205 | .label-style .button-delete { | 218 | .label-style .button-delete { |
206 | background-image: url(../images/icon-minus.png); | 219 | background-image: url(../images/icon-minus.png); |
207 | width: 15px; | 220 | width: 15px; |
@@ -210,43 +223,68 @@ | |||
210 | right: 31px; | 223 | right: 31px; |
211 | } | 224 | } |
212 | 225 | ||
213 | /* line 184, ../scss/Layer.scss */ | 226 | /* line 199, ../scss/Layer.scss */ |
214 | .collapsible-content .layout-table { | 227 | .collapsible-content .layout-table { |
215 | width: 99.9%; | 228 | width: 99.9%; |
216 | } | 229 | } |
217 | 230 | ||
218 | /* line 187, ../scss/Layer.scss */ | 231 | /* line 202, ../scss/Layer.scss */ |
219 | .content-layer .collapsible-content { | 232 | .content-layer .collapsible-content { |
220 | padding-left: 30px; | 233 | padding-left: 30px; |
221 | } | 234 | } |
222 | 235 | ||
223 | /* line 190, ../scss/Layer.scss */ | 236 | /* line 205, ../scss/Layer.scss */ |
237 | .collapsible-content .collapsible-content .layout-table .layout-row { | ||
238 | height: 20px; | ||
239 | overflow: hidden; | ||
240 | } | ||
241 | |||
242 | /* line 209, ../scss/Layer.scss */ | ||
224 | .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell { | 243 | .collapsible-content .collapsible-content .layout-table .layout-row .layout-cell { |
225 | width: 40%; | 244 | width: 40%; |
226 | height: 20px; | 245 | height: 20px; |
227 | border-bottom: 1px solid #505050; | 246 | border-bottom: 1px solid #505050; |
228 | line-height: 20px; | 247 | line-height: 20px; |
229 | text-align: left; | 248 | text-align: left; |
249 | overflow: hidden; | ||
250 | } | ||
251 | |||
252 | /* line 218, ../scss/Layer.scss */ | ||
253 | .collapsible-content .collapsible-content .container-row { | ||
254 | border-bottom: 1px solid #505050; | ||
255 | height: 20px; | ||
256 | } | ||
257 | |||
258 | /* line 224, ../scss/Layer.scss */ | ||
259 | .collapsible-content .collapsible-content .cell-property, | ||
260 | .collapsible-content .collapsible-content .cell-value { | ||
261 | width: 45%; | ||
262 | float: left; | ||
263 | height: 20px; | ||
264 | overflow: hidden; | ||
265 | text-overflow: ellipsis; | ||
266 | white-space: nowrap; | ||
267 | line-height: 18px; | ||
230 | } | 268 | } |