diff options
89 files changed, 596 insertions, 9398 deletions
diff --git a/css/ninja.css b/css/ninja.css index 48590fc8..a9a23d24 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -36,7 +36,7 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: " | |||
36 | 36 | ||
37 | button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } | 37 | button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } |
38 | 38 | ||
39 | button.nj-skinned:active, button.nj-skinned.active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } | 39 | button.nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } |
40 | 40 | ||
41 | button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } | 41 | button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } |
42 | 42 | ||
@@ -80,7 +80,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
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 | #bottomPanelContainer { background: transparent; min-height: 80px; max-height: 50%; overflow: auto; } |
84 | 84 | ||
85 | .panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } | 85 | .panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } |
86 | 86 | ||
@@ -164,6 +164,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
164 | 164 | ||
165 | #rightPanelContent { overflow-y: hidden; } | 165 | #rightPanelContent { overflow-y: hidden; } |
166 | 166 | ||
167 | .contextMenu { position: absolute; z-index: 999; } | ||
168 | |||
167 | #openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; } | 169 | #openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; } |
168 | 170 | ||
169 | #openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } | 171 | #openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } |
@@ -210,10 +212,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
210 | 212 | ||
211 | #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } | 213 | #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } |
212 | 214 | ||
213 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } | ||
214 | |||
215 | .montage-editor { padding: 0px; word-wrap: normal; } | ||
216 | |||
217 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } | 215 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } |
218 | 216 | ||
219 | .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } | 217 | .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } |
@@ -238,7 +236,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
238 | 236 | ||
239 | #toolPropertiesPanel { height: 32px; margin: 0px; } | 237 | #toolPropertiesPanel { height: 32px; margin: 0px; } |
240 | 238 | ||
241 | #timelinePanel { height: 100%; } | 239 | #timelinePanel { height: 116px; } |
242 | 240 | ||
243 | .treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; } | 241 | .treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; } |
244 | 242 | ||
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js index 2d26c8b4..ce5ac1af 100755 --- a/js/components/button.reel/button.js +++ b/js/components/button.reel/button.js | |||
@@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, { | |||
179 | value: function() { | 179 | value: function() { |
180 | if(this.isToggleButton) | 180 | if(this.isToggleButton) |
181 | { | 181 | { |
182 | if(this._value === true) | 182 | if(this._value) |
183 | { | 183 | { |
184 | this.element.classList.remove(this.offState); | 184 | this.element.classList.remove(this.offState); |
185 | this.element.classList.add(this.onState); | 185 | this.element.classList.add(this.onState); |
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js deleted file mode 100644 index 1d0ad776..00000000 --- a/js/components/editable.reel/editable.js +++ /dev/null | |||
@@ -1,250 +0,0 @@ | |||
1 | /* ComputedStyleSubPanel.js */ | ||
2 | var Montage = require("montage").Montage, | ||
3 | Component = require("montage/ui/component").Component; | ||
4 | |||
5 | |||
6 | /* | ||
7 | |||
8 | EDITABLE - Methods | ||
9 | - startEdit | ||
10 | - stopEdit | ||
11 | - value | ||
12 | - | ||
13 | - _suggest | ||
14 | - _suggestNext | ||
15 | - _suggestPrev |