diff options
author | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
commit | 0a469a14757b8cea262c21f652e75c85c9903f4b (patch) | |
tree | c388fdc93e9707e7d66f51ef41eb1d9b366716c7 /css | |
parent | 6034e3aa1d033149ba9ca8f0578e0a95889a7e46 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-0a469a14757b8cea262c21f652e75c85c9903f4b.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 | ||