aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/css/Layer.css
diff options
context:
space:
mode:
authorJonathan Duran2012-02-25 16:20:16 -0800
committerJonathan Duran2012-02-25 16:20:16 -0800
commit4e15de39bc1ea1a4c1141373d08b858b20106987 (patch)
treeef3030d561a0bef731f84078d5ece503cd60f37e /js/panels/Timeline/Layer.reel/css/Layer.css
parent1bc2de516c86f67c2107bd50df0589a273f4c5ab (diff)
parentf14bc1ace048e46cbcb7148dbe37a5d2065a3779 (diff)
downloadninja-4e15de39bc1ea1a4c1141373d08b858b20106987.tar.gz
Merge branch 'refs/heads/Timeline-local' into Timeline
Diffstat (limited to 'js/panels/Timeline/Layer.reel/css/Layer.css')
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css29
1 files changed, 13 insertions, 16 deletions
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 833c921c..18d0a5e3 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -235,14 +235,19 @@
235 border-top: 1px solid #505050; 235 border-top: 1px solid #505050;
236} 236}
237 237
238/* line 194, ../scss/Layer.scss */ 238/* line 195, ../scss/Layer.scss */
239.collapsible-content .hottextunit {
240 width: auto;
241}
242
243/* line 198, ../scss/Layer.scss */
239.collapsible-transition { 244.collapsible-transition {
240 -webkit-transition-property: height; 245 -webkit-transition-property: height;
241 -webkit-transition-duration: 200ms; 246 -webkit-transition-duration: 200ms;
242 -webkit-transition-timing-function: ease-in; 247 -webkit-transition-timing-function: ease-in;
243} 248}
244 249
245/* line 200, ../scss/Layer.scss */ 250/* line 206, ../scss/Layer.scss */
246.editable2 { 251.editable2 {
247 height: 20px; 252 height: 20px;
248 background-color: #242424 !important; 253 background-color: #242424 !important;
@@ -254,32 +259,24 @@
254 text-overflow: clip; 259 text-overflow: clip;
255} 260}
256 261
257<<<<<<< .mine=======/* line 210, ../scss/Layer.scss */ 262/* line 217, ../scss/Layer.scss */
258.label-style .disabled {
259 cursor: default;
260}
261
262/* styles elements */
263>>>>>>> .theirs/* line 215, ../scss/Layer.scss */
264.label-style .disabled { 263.label-style .disabled {
265 cursor: default; 264 cursor: default;
266} 265}
267 266
268/* styles elements */ 267/* styles elements */
269/* line 216, ../scss/Layer.scss */ 268/* line 222, ../scss/Layer.scss */
270.content-style .item-template { 269.content-style .item-template {
271 display: none; 270 display: none;
272} 271}
273 272
274<<<<<<< .mine/* line 219, ../scss/Layer.scss */ 273/* line 225, ../scss/Layer.scss */
275=======/* line 218, ../scss/Layer.scss */ 274.content-style .layout-row.selected .layout-cell {
276>>>>>>> .theirs.content-style .layout-row.selected .layout-cell {
277 background-color: #b2b2b2; 275 background-color: #b2b2b2;
278 color: #242424; 276 color: #242424;
279} 277}
280 278
281<<<<<<< .mine/* line 223, ../scss/Layer.scss */ 279/* line 229, ../scss/Layer.scss */
282=======/* line 222, ../scss/Layer.scss */ 280.style-row {
283>>>>>>> .theirs.style-row {
284 height: 20px; 281 height: 20px;
285} 282}