aboutsummaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-11 17:46:29 -0700
committerValerio Virgillito2012-06-11 17:46:29 -0700
commitb6c88f548c8d3756738e534418732710af733f03 (patch)
treed651ce2811019a3bccfd8be1326762cd2c601316 /css
parent91123fef348ec54d89005adbc151e816856a6a18 (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'css')
-rwxr-xr-xcss/ninja.css14
1 files changed, 1 insertions, 13 deletions
diff --git a/css/ninja.css b/css/ninja.css
index ce27977b..e3d560ab 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -909,7 +909,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
909 909
910::-webkit-scrollbar-track:disabled { display: none; } 910::-webkit-scrollbar-track:disabled { display: none; }
911 911
912:-webkit-scrollbar-track:vertical:disabled { display: none; } 912::-webkit-scrollbar-track:vertical:disabled { display: none; }
913 913
914::-webkit-scrollbar-track:horizontal:disabled { display: none; } 914::-webkit-scrollbar-track:horizontal:disabled { display: none; }
915 915
@@ -919,18 +919,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
919 919
920::-webkit-scrollbar-corner:disabled { display: none; } 920::-webkit-scrollbar-corner:disabled { display: none; }
921 921
922#iframeContainer::-webkit-resizer:disabled { display: block; }
923
924#iframeContainer::-webkit-scrollbar-track:vertical:disabled { display: block; }
925
926#iframeContainer::-webkit-scrollbar-track:horizontal:disabled { display: block; }
927
928#iframeContainer::-webkit-scrollbar-track-piece:disabled { display: block; }
929
930#iframeContainer::-webkit-scrollbar-corner:disabled { display: block; }
931
932#iframeContainer::-webkit-resizer:disabled { display: block; }
933
934.tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } 922.tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; }
935 923
936.tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; } 924.tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; }