diff options
author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /css | |
parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'css')
-rwxr-xr-x[-rw-r--r--] | css/ninja.css | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/css/ninja.css b/css/ninja.css index 54a4bbf1..d22cfc22 100644..100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -74,7 +74,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
74 | 74 | ||
75 | #appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; } | 75 | #appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; } |
76 | 76 | ||
77 | #topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 9999; } | 77 | #topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; } |
78 | 78 | ||
79 | #topPanelContainer, #leftPanelContainer, #rightPanelContainer, #bottomPanelContainer { background-color: #282828; } | 79 | #topPanelContainer, #leftPanelContainer, #rightPanelContainer, #bottomPanelContainer { background-color: #282828; } |
80 | 80 | ||
@@ -986,4 +986,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
986 | 986 | ||
987 | .tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; } | 987 | .tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; } |
988 | 988 | ||
989 | .montage-modal { border: 0px; } | ||
990 | |||
991 | .montage-popup-container { background: none; } | ||
992 | |||
989 | /*77*/ | 993 | /*77*/ |