diff options
author | Jon Reid | 2012-06-26 14:58:10 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /css/ninja.css | |
parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'css/ninja.css')
-rwxr-xr-x | css/ninja.css | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/css/ninja.css b/css/ninja.css index d98aa513..b71ab79c 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
118 | 118 | ||
119 | #sceneBar { height: 70px; background-color: #474747; } | 119 | #sceneBar { height: 70px; background-color: #474747; } |
120 | 120 | ||
121 | #mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } | 121 | #mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } |
122 | 122 | ||
123 | .rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } | 123 | .rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; } |
124 | 124 | ||
125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } | 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } |
126 | 126 | ||
@@ -600,7 +600,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba | |||
600 | 600 | ||
601 | .panels .panel { min-height: 25px; -webkit-box-flex: 0; display: -webkit-box; -webkit-box-orient: vertical; background: #282828; height: 200px; padding: 0px 2px; -webkit-box-sizing: border-box; } | 601 | .panels .panel { min-height: 25px; -webkit-box-flex: 0; display: -webkit-box; -webkit-box-orient: vertical; background: #282828; height: 200px; padding: 0px 2px; -webkit-box-sizing: border-box; } |
602 | 602 | ||
603 | .panels .panel .panelBody { -webkit-box-flex: 1; -webkit-box-sizing: border-box; -webkit-box-orient: vertical; -webkit-box-align: stretch; position: relative; overflow: auto; height: 200px; } | 603 | .panels .panel .panelBody { -webkit-box-flex: 1; -webkit-box-sizing: border-box; -webkit-box-orient: vertical; -webkit-box-align: stretch; position: relative; } |
604 | 604 | ||
605 | .panel .panelBodyContent { -webkit-box-sizing: border-box; -webkit-box-align: stretch; position: absolute; height: 100%; width: 100%; } | 605 | .panel .panelBodyContent { -webkit-box-sizing: border-box; -webkit-box-align: stretch; position: absolute; height: 100%; width: 100%; } |
606 | 606 | ||
@@ -871,6 +871,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
871 | 871 | ||
872 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } | 872 | .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } |
873 | 873 | ||
874 | .bindingTool { background-image: url("../images/tools/binding.png"); } | ||
875 | |||
874 | .blueDiv { background: blue; opacity: 0.2; } | 876 | .blueDiv { background: blue; opacity: 0.2; } |
875 | 877 | ||
876 | ::-webkit-scrollbar { width: 11px; height: 11px; } | 878 | ::-webkit-scrollbar { width: 11px; height: 11px; } |
@@ -933,4 +935,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
933 | 935 | ||
934 | .montage-invisible { display: none; } | 936 | .montage-invisible { display: none; } |
935 | 937 | ||
938 | .panels .panel { display: none; } | ||
939 | |||
940 | .panels .panel.ws-binding { display: none; -webkit-box-flex-group: 2; } | ||
941 | |||
942 | body.ws-binding .panel.ws-binding { display: -webkit-box; } | ||
943 | |||
944 | body.ws-default .panel.default { display: -webkit-box; -webkit-box-flex-group: 1; } | ||
945 | |||
936 | /*77*/ | 946 | /*77*/ |