diff options
author | hwc487 | 2012-04-04 16:32:53 -0700 |
---|---|---|
committer | hwc487 | 2012-04-04 16:32:53 -0700 |
commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /css | |
parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/css/ninja.css b/css/ninja.css index 605951e4..650f3b08 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -80,7 +80,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
80 | 80 | ||
81 | #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } | 81 | #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } |
82 | 82 | ||
83 | .timelinePanel { background: transparent; height: 150px; min-height: 46px; max-height: 50%; overflow: auto; } | 83 | .timelinePanel { background: transparent; height: 150px; min-height: 46px; max-height: 50%; overflow: auto; -webkit-transition: all 0.15s linear; } |
84 | 84 | ||
85 | .panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; } | 85 | .panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; } |
86 | 86 | ||
@@ -604,7 +604,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba | |||
604 | 604 | ||
605 | .pp_strokelabel { border: none; margin: -1px 8px 0px 27px; } | 605 | .pp_strokelabel { border: none; margin: -1px 8px 0px 27px; } |
606 | 606 | ||
607 | .pp_filllabel { border-width: none; margin: -1px 8px 0px 34px; } | 607 | .pp_filllabel { border: none; margin: -1px 8px 0px 34px; } |
608 | 608 | ||
609 | .panels { display: -webkit-box; position: absolute; -webkit-box-orient: vertical; -webkit-box-align: stretch; height: 100%; width: 100%; overflow: hidden; } | 609 | .panels { display: -webkit-box; position: absolute; -webkit-box-orient: vertical; -webkit-box-align: stretch; height: 100%; width: 100%; overflow: hidden; } |
610 | 610 | ||