diff options
author | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
commit | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (patch) | |
tree | 930a334bcda0c26ca02eaa33a1506d147e8691e1 /css | |
parent | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (diff) | |
parent | 71619045b692015b0889a4f5c381c1dee9c056cd (diff) | |
download | ninja-9fe5d98bf469036c856e28d71ad4160d630b4af4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/css/ninja.css b/css/ninja.css index d22cfc22..824a675a 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 { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } | 121 | #mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;} |
122 | 122 | ||
123 | #rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; } | 123 | #rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;} |
124 | 124 | ||
125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } | 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } |
126 | 126 | ||
@@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
174 | 174 | ||
175 | #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } | 175 | #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } |
176 | 176 | ||
177 | .montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } | ||
178 | |||
177 | #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } | 179 | #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } |
178 | 180 | ||
179 | #mainStageIFrame { border: none; margin: 4px; } | 181 | #mainStageIFrame { border: none; margin: 4px; } |