diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /css/ninja.css | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'css/ninja.css')
-rwxr-xr-x | css/ninja.css | 14 |
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; } |