diff options
author | John Mayhew | 2012-07-24 15:46:16 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-24 15:46:16 -0700 |
commit | 9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch) | |
tree | 407564eaa6466e8d4cf2eeee0c56dc623243586f /css | |
parent | d25359c75089215ee48838db081fd3d51cbbd85f (diff) | |
parent | 21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff) | |
download | ninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/css/ninja.css b/css/ninja.css index 288156b6..8e1666c2 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -98,7 +98,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
98 | 98 | ||
99 | #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; } | 99 | #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; } |
100 | 100 | ||
101 | #topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; } | 101 | #topMenu { background-color: #474747; position: absolute; height: 26px; width: 100%; top: 0px; left: 0px; z-index: 6995; } |
102 | 102 | ||
103 | #topPanelContainer, #leftPanelContainer, #rightPanelContainer, .timelinePanel { background-color: #282828; } | 103 | #topPanelContainer, #leftPanelContainer, #rightPanelContainer, .timelinePanel { background-color: #282828; } |
104 | 104 | ||
@@ -789,10 +789,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
789 | 789 | ||
790 | .tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; } | 790 | .tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; } |
791 | 791 | ||
792 | .tagRadioButtons select.nj-skinned { visibility: visible; position: relative; margin-top: 1px; } | ||
793 | |||
794 | .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } | ||
795 | |||
796 | #zoomToolOptionHolder .zoomOutToolIcon { background-image: url("../images/optionsbar/zoom/zoom_minus.png"); } | 792 | #zoomToolOptionHolder .zoomOutToolIcon { background-image: url("../images/optionsbar/zoom/zoom_minus.png"); } |
797 | 793 | ||
798 | #zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); } | 794 | #zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); } |