aboutsummaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /css
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'css')
-rwxr-xr-xcss/ninja.css28
1 files changed, 9 insertions, 19 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 297ed7cd..cd7a35ab 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ 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 { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } 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 { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } 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
@@ -164,9 +164,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
164 164
165.verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; } 165.verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; }
166 166
167#rightPanelContent { overflow-y: hidden; } 167.openDocumentsTab { height: 25px; position: relative; overflow: hidden; color: white; }
168
169#openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; }
170 168
171#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } 169#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; }
172 170
@@ -174,7 +172,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
174 172
175#openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { background-color: #7f7f7f; } 173#openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { background-color: #7f7f7f; }
176 174
177#documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } 175.documentBar { height: 25px; position: relative; overflow: hidden; color: white; }
178 176
179.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } 177.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); }
180 178
@@ -200,19 +198,11 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
200 198
201#iframeContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; width: 100%; height: 100%; overflow: scroll; background: gray; } 199#iframeContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; width: 100%; height: 100%; overflow: scroll; background: gray; }
202 200
203#drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; } 201.drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; }
204
205#stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; }
206
207#layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; }
208
209#codeViewContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; background: black; width: 100%; height: 100%; display: none; }
210
211#mainContent #codeMirror_1 { height: 100%; }
212 202
213#mainContent .CodeMirror { width: 100%; height: 100%; background: white; } 203.stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; }
214 204
215#mainContent .CodeMirror-scroll { height: 100%; overflow:auto; } 205.layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; }
216 206
217.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } 207.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
218 208
@@ -648,7 +638,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba
648 638
649.panel.collapsed .arrowIcon { -webkit-transform: rotate(-90deg); } 639.panel.collapsed .arrowIcon { -webkit-transform: rotate(-90deg); }
650 640
651.rightPanelContent { position: absolute; height: 100%; width: 100%; } 641.rightPanelContent { position: absolute; overflow-y: hidden; height: 100%; width: 100%; }
652 642
653#rightPanelContainer .panel { -webkit-box-flex: 100; } 643#rightPanelContainer .panel { -webkit-box-flex: 100; }
654 644
@@ -821,7 +811,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
821 811
822.toolsList { width: 29px; margin: auto; } 812.toolsList { width: 29px; margin: auto; }
823 813
824.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; } 814.toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; width: 100%; }
825 815
826.toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); } 816.toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); }
827 817