aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss120
1 files changed, 60 insertions, 60 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 460fe5e3..eafa9dd6 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* TimelinePanel.scss 33/* TimelinePanel.scss
34 * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. 34 * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css.
35 */ 35 */
36 36
37// Import theme settings 37// Import theme settings
38@import "../../../../../scss/imports/themes/default/colors"; 38@import "../../../../../scss/imports/themes/default/colors";
39// @import "../../../../../scss/imports/themes/default/fonts"; 39// @import "../../../../../scss/imports/themes/default/fonts";
@@ -85,16 +85,16 @@ POSSIBILITY OF SUCH DAMAGE.
85} 85}
86 86
87#bottomPanelContainer { 87#bottomPanelContainer {
88 overflow: hidden !IMPORTANT; 88 overflow: hidden !IMPORTANT;
89} 89}
90 90
91.layout-tracks { 91.layout-tracks {
92 width: 100%; 92 width: 100%;
93 height: 100%; 93 height: 100%;
94 padding-bottom: 6px; 94 padding-bottom: 6px;
95 box-sizing: border-box; 95 box-sizing: border-box;
96 overflow: auto; 96 overflow: auto;
97 position: relative; 97 position: relative;
98} 98}
99.tl_layertracks{ 99.tl_layertracks{
100 background-color: $color-tool-bg; 100 background-color: $color-tool-bg;
@@ -102,7 +102,7 @@ POSSIBILITY OF SUCH DAMAGE.
102 width: 100%; 102 width: 100%;
103 -webkit-box-flex: 1; 103 -webkit-box-flex: 1;
104 padding-top: 21px; 104 padding-top: 21px;
105 box-sizing: border-box; 105 box-sizing: border-box;
106} 106}
107.layerresizer{ 107.layerresizer{
108 height: auto; 108 height: auto;
@@ -183,12 +183,12 @@ POSSIBILITY OF SUCH DAMAGE.
183 overflow: visible; 183 overflow: visible;
184} 184}
185.layout_markers { 185.layout_markers {
186 position: absolute; 186 position: absolute;
187 overflow: hidden; 187 overflow: hidden;
188 top: 0px; 188 top: 0px;
189 left: 0px; 189 left: 0px;
190 height: 20px; 190 height: 20px;
191 width: 100%; 191 width: 100%;
192 border-bottom-style: solid; 192 border-bottom-style: solid;
193} 193}
194 194
@@ -220,7 +220,7 @@ POSSIBILITY OF SUCH DAMAGE.
220.container-tracks, 220.container-tracks,
221.timelinemarkers, 221.timelinemarkers,
222.mastertrack { 222.mastertrack {
223 width: 2000px; 223 width: 2000px;
224} 224}
225.userlayers{ 225.userlayers{
226 width: 100%; 226 width: 100%;
@@ -316,18 +316,18 @@ POSSIBILITY OF SUCH DAMAGE.
316 margin-top: 0%; 316 margin-top: 0%;
317} 317}
318.timeline-disabled { 318.timeline-disabled {
319 position: absolute; 319 position: absolute;
320 top: 0px; 320 top: 0px;
321 left: 0px; 321 left: 0px;
322 width: 100%; 322 width: 100%;
323 height: 100%; 323 height: 100%;
324 background-color: rgba(30,30,30, 0.796); 324 background-color: rgba(30,30,30, 0.796);
325 z-index: 100; 325 z-index: 100;
326 display: none; 326 display: none;
327 box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; 327 box-shadow: rgb(17, 17, 17) 0px 0px 14px inset;
328} 328}
329.timeline-dnd-helper { 329.timeline-dnd-helper {
330 -webkit-transform: scale(.9, .9); 330 -webkit-transform: scale(.9, .9);
331} 331}
332.tl_slider{ 332.tl_slider{
333 width: 65px; 333 width: 65px;
@@ -340,60 +340,60 @@ POSSIBILITY OF SUCH DAMAGE.
340 340
341/* Configuration menu */ 341/* Configuration menu */
342.layer-master { 342.layer-master {
343 position: relative; 343 position: relative;
344} 344}
345.tl-configbutton { 345.tl-configbutton {
346 position: absolute; 346 position: absolute;
347 top: 0px; 347 top: 0px;
348 right: 2px; 348 right: 2px;
349 width: 20px; 349 width: 20px;
350 height: 20px; 350 height: 20px;
351 background-image: url(../images/icon-gear.png); 351 background-image: url(../images/icon-gear.png);
352 background-repeat: no-repeat; 352 background-repeat: no-repeat;
353 cursor: pointer; 353 cursor: pointer;
354 z-index: 100; 354 z-index: 100;
355 background-position: 100% 0px; 355 background-position: 100% 0px;
356} 356}
357.tl-configbutton:hover { 357.tl-configbutton:hover {
358 width: 180px; 358 width: 180px;
359} 359}
360 360
361.tl-configbutton .tl-dropdown { 361.tl-configbutton .tl-dropdown {
362 position: absolute; 362 position: absolute;
363 border: 1px solid $color-panel-border; 363 border: 1px solid $color-panel-border;
364 top: 16px; 364 top: 16px;
365 right: 2px; 365 right: 2px;
366 width: 180px; 366 width: 180px;
367 padding-bottom: 7px; 367 padding-bottom: 7px;
368 background-color: $color-menu-bg; 368 background-color: $color-menu-bg;
369 box-shadow: 2px 2px 2px $color-app-shadow; 369 box-shadow: 2px 2px 2px $color-app-shadow;
370 display: none; 370 display: none;
371} 371}
372.tl-configbutton.checked .tl-dropdown { 372.tl-configbutton.checked .tl-dropdown {
373 display: block; 373 display: block;
374} 374}
375 375
376.tl-configbutton .checkable { 376.tl-configbutton .checkable {
377 padding-left: 20px; 377 padding-left: 20px;
378 height: 20px; 378 height: 20px;
379 line-height: 20px; 379 line-height: 20px;
380 margin-top: 3px; 380 margin-top: 3px;
381} 381}
382.tl-configbutton .checkable:hover { 382.tl-configbutton .checkable:hover {
383 background-color: $color-panel-hilite-bg; 383 background-color: $color-panel-hilite-bg;
384 color: $color-panel-hilite-text; 384 color: $color-panel-hilite-text;
385 text-shadow: none; 385 text-shadow: none;
386} 386}
387.tl-configbutton .checkable.checked { 387.tl-configbutton .checkable.checked {
388 background-image: url(../images/icon-checkmark.png); 388 background-image: url(../images/icon-checkmark.png);
389 background-repeat: no-repeat; 389 background-repeat: no-repeat;
390 background-position: 6px 4px; 390 background-position: 6px 4px;
391} 391}
392 392
393.tl-configbutton .nj-divider { 393.tl-configbutton .nj-divider {
394 margin-top: 7px; 394 margin-top: 7px;
395} 395}
396 396
397.layer-hidden { 397.layer-hidden {
398 display: none; 398 display: none;
399} 399}