aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rwxr-xr-xcss/ninja.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html30
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.css1
-rwxr-xr-xjs/data/menu-data.js9
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js8
-rwxr-xr-xjs/models/app-model.js13
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
-rw-r--r--js/panels/presets/content.reel/content.css52
-rw-r--r--js/panels/presets/content.reel/content.html66
-rw-r--r--js/panels/presets/content.reel/content.js79
-rw-r--r--js/panels/presets/default-style-presets.js72
-rw-r--r--js/panels/presets/default-transition-presets.js93
-rw-r--r--js/panels/presets/presets-panel.js15
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.css0
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html59
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js79
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.css0
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html58
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js46
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js8
-rw-r--r--manifest.json6
-rwxr-xr-xscss/imports/scss/_MainWindow.scss10
-rw-r--r--scss/imports/scss/_Stage.scss13
24 files changed, 699 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index 6c288e8c..40248468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
8.DS_Store 8.DS_Store
9.project 9.project
10 10
11_scss/compass_app_log.txt
12_scss/.sass-cache
13
14js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc 11js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
15js/panels/Color/colorpanelpopup.reel/compass_app_log.txt 12js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
16js/panels/Color/colorpanelbase.reel/compass_app_log.txt 13js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
21cloud/ 18cloud/
22 19
23/.idea/scopes/scope_settings.xml 20/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss
25compass_app_log.txt 21compass_app_log.txt
26js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file 22js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
23scss/.sass-cache/ \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index 824a675a..96ae6caf 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 { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;} 121#mainContainer #rulerTop { background: gray; height: 15px; margin-bottom: 0px; }
122 122
123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;} 123#rulerLeft { background: gray; width: 16px; }
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index a7d2af10..13a88ba7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -100,7 +100,8 @@
100 "pressedClass": "active", 100 "pressedClass": "active",
101 "preventFocus": true, 101 "preventFocus": true,
102 "identifier": "btnBold", 102 "identifier": "btnBold",
103 "label": "B" 103 "pressedLabel": "B",
104 "unpressedLabel": "B"
104 }, 105 },
105 "listeners": [ 106 "listeners": [
106 { 107 {
@@ -117,7 +118,8 @@
117 "pressedClass": "active", 118 "pressedClass": "active",
118 "preventFocus": true, 119 "preventFocus": true,
119 "identifier": "btnItalic", 120 "identifier": "btnItalic",
120 "label": "I" 121 "pressedLabel": "I",
122 "unpressedLabel": "I"
121 }, 123 },
122 "listeners": [ 124 "listeners": [
123 { 125 {
@@ -134,7 +136,8 @@
134 "pressedClass": "active", 136 "pressedClass": "active",
135 "preventFocus": true, 137 "preventFocus": true,
136 "identifier": "btnUnderline", 138 "identifier": "btnUnderline",
137 "label": "U" 139 "pressedLabel": "U",
140 "unpressedLabel": "U"
138 }, 141 },
139 "listeners": [ 142 "listeners": [
140 { 143 {
@@ -151,7 +154,8 @@
151 "pressedClass": "active", 154 "pressedClass": "active",
152 "preventFocus": true, 155 "preventFocus": true,
153 "identifier": "btnStrikethrough", 156 "identifier": "btnStrikethrough",
154 "label": "S" 157 "pressedLabel": "S",
158 "unpressedLabel": "S"
155 }, 159 },
156 "listeners": [ 160 "listeners": [
157 { 161 {
@@ -169,7 +173,8 @@
169 "pressedClass": "active", 173 "pressedClass": "active",
170 "preventFocus": true, 174 "preventFocus": true,
171 "identifier": "alignLeft", 175 "identifier": "alignLeft",
172 "label": "Left" 176 "pressedLabel": "Left",
177 "unpressedLabel": "Left"
173 }, 178 },
174 "listeners": [ 179 "listeners": [
175 { 180 {
@@ -186,7 +191,8 @@
186 "pressedClass": "active", 191 "pressedClass": "active",
187 "preventFocus": true, 192 "preventFocus": true,
188 "identifier": "alignCenter", 193 "identifier": "alignCenter",
189 "label": "Center" 194 "pressedLabel": "Center",
195 "unpressedLabel": "Center"
190 }, 196 },
191 "listeners": [ 197 "listeners": [
192 { 198 {
@@ -203,7 +209,8 @@
203 "pressedClass": "active", 209 "pressedClass": "active",
204 "preventFocus": true, 210 "preventFocus": true,
205 "identifier": "alignRight", 211 "identifier": "alignRight",
206 "label": "Right" 212 "pressedLabel": "Right",
213 "unpressedLabel": "Right"
207 }, 214 },
208 "listeners": [ 215 "listeners": [
209 { 216 {
@@ -220,7 +227,8 @@
220 "pressedClass": "active", 227 "pressedClass": "active",
221 "preventFocus": true, 228 "preventFocus": true,
222 "identifier": "alignJustify", 229 "identifier": "alignJustify",
223 "label": "Justify" 230 "pressedLabel": "Justify",
231 "unpressedLabel": "Justify"
224 }, 232 },
225 "listeners": [ 233 "listeners": [
226 { 234 {
@@ -271,7 +279,8 @@
271 "pressedClass": "active", 279 "pressedClass": "active",
272 "preventFocus": true, 280 "preventFocus": true,
273 "identifier": "bulletedList", 281 "identifier": "bulletedList",
274 "label": "• • •" 282 "pressedLabel": "• • •",
283 "unpressedLabel": "• • •"
275 }, 284 },
276 "listeners": [ 285 "listeners": [
277 { 286 {
@@ -288,7 +297,8 @@
288 "pressedClass": "active", 297 "pressedClass": "active",
289 "preventFocus": true, 298 "preventFocus": true,
290 "identifier": "numberedList", 299 "identifier": "numberedList",
291 "label": "1 2 3" 300 "pressedLabel": "1 2 3",
301 "unpressedLabel": "1 2 3"
292 }, 302 },
293 "listeners": [ 303 "listeners": [
294 { 304 {
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index a3a9350e..340233c7 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,6 @@
26 cursor: pointer; 26 cursor: pointer;
27 font-weight: bold; 27</