aboutsummaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorKruti Shah2012-06-27 09:25:42 -0700
committerKruti Shah2012-06-27 09:25:42 -0700
commitd6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch)
treec37300f67a3fb502d7f4e277600944739d48fd82 /css
parentb52747edbeba7d210fca98acccb2d2df52134bca (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'css')
-rwxr-xr-xcss/ninja.css16
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
942body.ws-binding .panel.ws-binding { display: -webkit-box; }
943
944body.ws-default .panel.default { display: -webkit-box; -webkit-box-flex-group: 1; }
945
936/*77*/ 946/*77*/