diff options
author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
tree | 6b48b82604e194016ca048ad912f8015de719999 /css | |
parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'css')
-rwxr-xr-x | css/ninja.css | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/css/ninja.css b/css/ninja.css index 8213ec26..605951e4 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -76,11 +76,11 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
76 | 76 | ||
77 | #topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; } | 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, .timelinePanel { background-color: #282828; } |
80 | 80 | ||
81 | #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } | 81 | #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } |
82 | 82 | ||
83 | #bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; } | 83 | .timelinePanel { background: transparent; height: 150px; min-height: 46px; max-height: 50%; overflow: auto; } |
84 | 84 | ||
85 | .panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; } | 85 | .panelContainer { display: -webkit-box; -webkit-box-orient: vertical; position: relative; } |
86 | 86 | ||
@@ -92,7 +92,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
92 | 92 | ||
93 | .mainContainerContent { position: absolute; display: -webkit-box; width: 100%; height: 100%; -webkit-box-orient: vertical; } | 93 | .mainContainerContent { position: absolute; display: -webkit-box; width: 100%; height: 100%; -webkit-box-orient: vertical; } |
94 | 94 | ||
95 | .mainContainerContent > #mainContent { -webkit-box-flex: 1; display: -webkit-box; -webkit-box-orient: horizontal; margin-top: 0px; } | 95 | .mainContainerContent > #mainContent { -webkit-box-flex: 1; display: -webkit-box; -webkit-box-orient: horizontal; margin-top: 0px; position: relative; } |
96 | 96 | ||
97 | .mainContainerContent > section { margin-top: 2px; -webkit-box-flex: 0; } | 97 | .mainContainerContent > section { margin-top: 2px; -webkit-box-flex: 0; } |
98 | 98 | ||
@@ -118,15 +118,17 @@ 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: gray; height: 15px; margin-bottom: 0px; } | 121 | #mainContainer #rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } |
122 | 122 | ||
123 | #rulerLeft { background: gray; width: 16px; } | 123 | #rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } |
124 | 124 | ||
125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } | 125 | #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } |
126 | 126 | ||
127 | #stageContainer { -webkit-box-flex: 1; position: relative; } | 127 | #stageContainer { -webkit-box-flex: 1; position: relative; } |
128 | 128 | ||
129 | .timelineResizer { background: black center center no-repeat url("data:image/gif;base64,R0lGODlhGQADAMQAAD49PXx8fGppaSYmJl9fXysrKykpKW5uboqJiUxMTGlpaV9eXjo6OoeHhyUkJD09PSoqKmpqaj8/P4qKiiQkJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjEgNjQuMTQwOTQ5LCAyMDEwLzEyLzA3LTEwOjU3OjAxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdEMUI3NjM1QkQ1QTExRTBBMTJFQzE1RDk5REVFRkI4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdEMUI3NjM2QkQ1QTExRTBBMTJFQzE1RDk5REVFRkI4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6N0QxQjc2MzNCRDVBMTFFMEExMkVDMTVEOTlERUVGQjgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6N0QxQjc2MzRCRDVBMTFFMEExMkVDMTVEOTlERUVGQjgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQAAAAAACwAAAAAGQADAAAFH6ABDVRpnujpQAXxKFIUz3JNzwKwMEcz/cCgMIgIJEIAOw=="); width: 100%; height: 6px; cursor: row-resize; } | 129 | .pasteboardResizer { position: absolute; width: 11px; height: 11px; bottom: 0px; right: 0px; z-index: 20; background-image: url("../images/scrollbars/scrollbar_resizer.png"); background-repeat: no-repeat; background-color: #000; cursor: se-resize; } |
130 | |||
131 | .timelineResizer { background: #282828; width: 100%; height: 6px; cursor: row-resize; } | ||
130 | 132 | ||
131 | .timelineResizer.collapsed { height: 0px !important; margin: 0px !important; padding: 0px !important; } | 133 | .timelineResizer.collapsed { height: 0px !important; margin: 0px !important; padding: 0px !important; } |
132 | 134 | ||
@@ -136,7 +138,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
136 | 138 | ||
137 | .resizeBar { -webkit-transition: all 0.15s linear; } | 139 | .resizeBar { -webkit-transition: all 0.15s linear; } |
138 | 140 | ||
139 | .panelContainer, .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } | 141 | .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } |
140 | 142 | ||
141 | .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex: 0.1 !important; } | 143 | .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex: 0.1 !important; } |
142 | 144 | ||
@@ -144,7 +146,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
144 | 146 | ||
145 | #rightPanelContainer.collapsed, #leftPanelContainer.collapsed { width: 0px !important; min-width: 0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } | 147 | #rightPanelContainer.collapsed, #leftPanelContainer.collapsed { width: 0px !important; min-width: 0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } |
146 | 148 | ||
147 | #topPanelContainer.collapsed, #bottomPanelContainer.collapsed { height: 0px !important; min-height: 0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } | 149 | #topPanelContainer.collapsed, .timelinePanel.collapsed { height: 0px !important; min-height: 0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } |
148 | 150 | ||
149 | .leftSplitter.collapsed { -webkit-transform: rotate(180deg); } | 151 | .leftSplitter.collapsed { -webkit-transform: rotate(180deg); } |
150 | 152 | ||
@@ -707,10 +709,6 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul | |||
707 | 709 | ||
708 | .subToolPropertiespanel { margin-left: 43px; } | 710 | .subToolPropertiespanel { margin-left: 43px; } |
709 | 711 | ||
710 | .LockToolUp { background-image: url("../images/optionsbar/link.png"); background-repeat: no-repeat; width: 17px; height: 18px; margin-right: 10px; } | ||
711 | |||
712 | .UnLockToolUp { background-image: url("../images/optionsbar/unlinked.png"); background-repeat: no-repeat; width: 17px; height: 18px; margin-right: 10px; } | ||
713 | |||
714 | .cornerRadius { background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); background-repeat: no-repeat; width: 16px; height: 16px; opacity: 0.7; } | 712 | .cornerRadius { background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); background-repeat: no-repeat; width: 16px; height: 16px; opacity: 0.7; } |
715 | 713 | ||
716 | .cornerRadius:hover, .cornerRadius:active { opacity: 1; } | 714 | .cornerRadius:hover, .cornerRadius:active { opacity: 1; } |
@@ -975,7 +973,17 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
975 | 973 | ||
976 | ::-webkit-scrollbar-corner:disabled { display: none; } | 974 | ::-webkit-scrollbar-corner:disabled { display: none; } |
977 | 975 | ||
978 | ::-webkit-resizer:disabled { display: none; } | 976 | #iframeContainer::-webkit-resizer:disabled { display: block; } |
977 | |||
978 | #iframeContainer::-webkit-scrollbar-track:vertical:disabled { display: block; } | ||
979 | |||
980 | #iframeContainer::-webkit-scrollbar-track:horizontal:disabled { display: block; } | ||
981 | |||
982 | #iframeContainer::-webkit-scrollbar-track-piece:disabled { display: block; } | ||
983 | |||
984 | #iframeContainer::-webkit-scrollbar-corner:disabled { display: block; } | ||
985 | |||
986 | #iframeContainer::-webkit-resizer:disabled { display: block; } | ||
979 | 987 | ||
980 | .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } | 988 | .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } |
981 | 989 | ||