aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/css
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/Layer.reel/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 3547a15e..3d7ba963 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -229,14 +229,19 @@
229 border-top: 1px solid #505050; 229 border-top: 1px solid #505050;
230} 230}
231 231
232/* line 194, ../scss/Layer.scss */ 232/* line 195, ../scss/Layer.scss */
233.collapsible-content .hottextunit {
234 width: auto;
235}
236
237/* line 198, ../scss/Layer.scss */
233.collapsible-transition { 238.collapsible-transition {
234 -webkit-transition-property: height; 239 -webkit-transition-property: height;
235 -webkit-transition-duration: 200ms; 240 -webkit-transition-duration: 200ms;
236 -webkit-transition-timing-function: ease-in; 241 -webkit-transition-timing-function: ease-in;
237} 242}
238 243
239/* line 200, ../scss/Layer.scss */ 244/* line 206, ../scss/Layer.scss */
240.editable2 { 245.editable2 {
241 height: 20px; 246 height: 20px;
242 background-color: #242424 !important; 247 background-color: #242424 !important;
@@ -248,32 +253,24 @@
248 text-overflow: clip; 253 text-overflow: clip;
249} 254}
250 255
251<<<<<<< .mine=======/* line 210, ../scss/Layer.scss */ 256/* line 217, ../scss/Layer.scss */
252.label-style .disabled {
253 cursor: default;
254}
255
256/* styles elements */
257>>>>>>> .theirs/* line 215, ../scss/Layer.scss */
258.label-style .disabled { 257.label-style .disabled {
259 cursor: default; 258 cursor: default;
260} 259}
261 260
262/* styles elements */ 261/* styles elements */
263/* line 216, ../scss/Layer.scss */ 262/* line 222, ../scss/Layer.scss */
264.content-style .item-template { 263.content-style .item-template {
265 display: none; 264 display: none;
266} 265}
267 266
268<<<<<<< .mine/* line 219, ../scss/Layer.scss */ 267/* line 225, ../scss/Layer.scss */
269=======/* line 218, ../scss/Layer.scss */ 268.content-style .layout-row.selected .layout-cell {
270>>>>>>> .theirs.content-style .layout-row.selected .layout-cell {
271 background-color: #b2b2b2; 269 background-color: #b2b2b2;
272 color: #242424; 270 color: #242424;
273} 271}
274 272
275<<<<<<< .mine/* line 223, ../scss/Layer.scss */ 273/* line 229, ../scss/Layer.scss */
276=======/* line 222, ../scss/Layer.scss */ 274.style-row {
277>>>>>>> .theirs.style-row {
278 height: 20px; 275 height: 20px;
279} 276}