diff options
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Splitter.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 | ||||
-rw-r--r-- | js/panels/presets/default-animation-presets.js | 2 | ||||
-rw-r--r-- | js/panels/presets/default-style-presets.js | 11 | ||||
-rw-r--r-- | js/panels/presets/default-transition-presets.js | 8 | ||||
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.js | 4 | ||||
-rw-r--r-- | js/panels/resize-composer.js | 34 |
7 files changed, 27 insertions, 38 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index ac45b4ba..98ebb36a 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, { | |||
55 | }, | 55 | }, |
56 | set: function(value) { | 56 | set: function(value) { |
57 | this._collapsed = value; | 57 | this._collapsed = value; |
58 | this.needsDraw = true; | 58 | |
59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); | 59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); |
60 | } | 60 | } |
61 | }, | 61 | }, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 067285ae..129b9771 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -10,12 +10,12 @@ | |||
10 | height: 100%; | 10 | height: 100%; |
11 | } | 11 | } |
12 | .maintimeline{ | 12 | .maintimeline{ |
13 | border-style: double; | ||
13 | -webkit-box-flex: 1; | 14 | -webkit-box-flex: 1; |
14 | display: -webkit-box; | 15 | display: -webkit-box; |
15 | -webkit-box-orient: horizontal; | 16 | -webkit-box-orient: horizontal |
16 | height : 100%; | 17 | height : 100%; |
17 | position: relative; | 18 | position: relative; |
18 | margin-top:1px; | ||
19 | } | 19 | } |
20 | .leftinside{ | 20 | .leftinside{ |
21 | height: 100%; | 21 | height: 100%; |
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 578c1622..4793c356 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -13,6 +13,7 @@ exports.animationPresets = { | |||
13 | "text": "Border Morph", | 13 | "text": "Border Morph", |
14 | "selectorBase" : "border-morph", | 14 | "selectorBase" : "border-morph", |
15 | "rules" : [{ | 15 | "rules" : [{ |
16 | "selectorSuffix" : "", | ||
16 | "styles" : { | 17 | "styles" : { |
17 | "-webkit-animation-name": "border-morph", | 18 | "-webkit-animation-name": "border-morph", |
18 | "-webkit-animation-duration": "2s", | 19 | "-webkit-animation-duration": "2s", |
@@ -92,6 +93,7 @@ exports.animationPresets = { | |||
92 | "text": "Rotater", | 93 | "text": "Rotater", |
93 | "selectorBase" : "rotate-with-alpha-keyframes", | 94 | "selectorBase" : "rotate-with-alpha-keyframes", |
94 | "rules" : [{ | 95 | "rules" : [{ |
96 | "selectorSuffix" : "", | ||
95 | "styles" : { | 97 | "styles" : { |
96 | "-webkit-animation-name": "rotate-with-alpha-keyframes", | 98 | "-webkit-animation-name": "rotate-with-alpha-keyframes", |
97 | "-webkit-animation-duration": "5s", | 99 | "-webkit-animation-duration": "5s", |
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js index 10b24ff4..82bec34f 100644 --- a/js/panels/presets/default-style-presets.js +++ b/js/panels/presets/default-style-presets.js | |||
@@ -11,9 +11,9 @@ exports.stylePresets = { | |||
11 | "children": [ | 11 | "children": [ |
12 | { | 12 | { |
13 | "text": "Border-Radius", | 13 | "text": "Border-Radius", |
14 | "id": "njBorderRadius", | ||
15 | "selectorBase" : "border-radius-preset", | 14 | "selectorBase" : "border-radius-preset", |
16 | "rules" : [{ | 15 | "rules" : [{ |
16 | "selectorSuffix" : "", | ||
17 | "styles" : { | 17 | "styles" : { |
18 | "border-radius": "100px", | 18 | "border-radius": "100px", |
19 | "border" : "1px solid #333" | 19 | "border" : "1px solid #333" |
@@ -22,9 +22,9 @@ exports.stylePresets = { | |||
22 | }, | 22 | }, |
23 | { | 23 | { |
24 | "text": "Drop Shadow", | 24 | "text": "Drop Shadow", |
25 | "id": "njDropShadow", | ||
26 | "selectorBase" : "drop-shadow", | 25 | "selectorBase" : "drop-shadow", |
27 | "rules" : [{ | 26 | "rules" : [{ |
27 | "selectorSuffix" : "", | ||
28 | "styles" : { | 28 | "styles" : { |
29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", | 29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", |
30 | "border" : "1px solid #CCC" | 30 | "border" : "1px solid #CCC" |
@@ -33,10 +33,9 @@ exports.stylePresets = { | |||
33 | }, | 33 | }, |
34 | { | 34 | { |
35 | "text": "Fancy Box", | 35 | "text": "Fancy Box", |
36 | "id": "njFancyBox", | ||
37 | "selectorBase" : "fancy-box", | 36 | "selectorBase" : "fancy-box", |
38 | "rules" : [{ | 37 | "rules" : [{ |
39 | "selectorSuffix": "", | 38 | "selectorSuffix" : "", |
40 | "styles" : { | 39 | "styles" : { |
41 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", | 40 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", |
42 | "border" : "1px solid #FFF", | 41 | "border" : "1px solid #FFF", |
@@ -51,9 +50,9 @@ exports.stylePresets = { | |||
51 | "children": [ | 50 | "children": [ |
52 | { | 51 | { |
53 | "text": "Italic", | 52 | "text": "Italic", |
54 | "id": "njItalic", | ||
55 | "selectorBase" : "italicize", | 53 | "selectorBase" : "italicize", |
56 | "rules" : [{ | 54 | "rules" : [{ |
55 | "selectorSuffix" : "", | ||
57 | "styles" : { | 56 | "styles" : { |
58 | "font-style": "italic" | 57 | "font-style": "italic" |
59 | } | 58 | } |
@@ -61,9 +60,9 @@ exports.stylePresets = { | |||
61 | }, | 60 | }, |
62 | { | 61 | { |
63 | "text": "Text Shadow", | 62 | "text": "Text Shadow", |
64 | "id": "njTextShadow", | ||
65 | "selectorBase" : "italicize", | 63 | "selectorBase" : "italicize", |
66 | "rules" : [{ | 64 | "rules" : [{ |
65 | "selectorSuffix" : "", | ||
67 | "styles" : { | 66 | "styles" : { |
68 | "text-shadow": "1px 1px 3px #333" | 67 | "text-shadow": "1px 1px 3px #333" |
69 | } | 68 | } |
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index f8968085..15f4882f 100644 --- a/js/panels/presets/default-transition-presets.js +++ b/js/panels/presets/default-transition-presets.js | |||
@@ -13,6 +13,7 @@ exports.transitionPresets = { | |||
13 | "text": "Fade In", | 13 | "text": "Fade In", |
14 | "selectorBase" : "fade-in", | 14 | "selectorBase" : "fade-in", |
15 | "rules" : [{ | 15 | "rules" : [{ |
16 | "selectorSuffix": "", | ||
16 | "styles" : { | 17 | "styles" : { |
17 | "opacity": "0.25", | 18 | "opacity": "0.25", |
18 | "-webkit-transition": "all 0.4s ease-in" | 19 | "-webkit-transition": "all 0.4s ease-in" |
@@ -28,6 +29,7 @@ exports.transitionPresets = { | |||
28 | "text": "Fade Out", | 29 | "text": "Fade Out", |
29 | "selectorBase" : "fade-out", | 30 | "selectorBase" : "fade-out", |
30 | "rules" : [{ | 31 | "rules" : [{ |
32 | "selectorSuffix": "", | ||
31 | "styles" : { | 33 | "styles" : { |
32 | "opacity": "1", | 34 | "opacity": "1", |
33 | "-webkit-transition": "all 0.4s ease-in" | 35 | "-webkit-transition": "all 0.4s ease-in" |
@@ -46,6 +48,7 @@ exports.transitionPresets = { | |||
46 | "text": "Slide Right", | 48 | "text": "Slide Right", |
47 | "selectorBase" : "slide-right", | 49 | "selectorBase" : "slide-right", |
48 | "rules" : [{ | 50 | "rules" : [{ |
51 | "selectorSuffix": "", | ||
49 | "styles" : { | 52 | "styles" : { |
50 | "-webkit-transition": "all 0.4s ease-in" | 53 | "-webkit-transition": "all 0.4s ease-in" |
51 | } | 54 | } |
@@ -60,6 +63,7 @@ exports.transitionPresets = { | |||
60 | "text": "Slide Left", | 63 | "text": "Slide Left", |
61 | "selectorBase" : "slide-left", | 64 | "selectorBase" : "slide-left", |
62 | "rules" : [{ | 65 | "rules" : [{ |
66 | "selectorSuffix": "", | ||
63 | "styles" : { | 67 | "styles" : { |
64 | "-webkit-transition": "all 0.4s ease-in" | 68 | "-webkit-transition": "all 0.4s ease-in" |
65 | } | 69 | } |
@@ -74,6 +78,7 @@ exports.transitionPresets = { | |||
74 | "text": "Rotate", | 78 | "text": "Rotate", |
75 | "selectorBase" : "rotate", | 79 | "selectorBase" : "rotate", |
76 | "rules" : [{ | 80 | "rules" : [{ |
81 | "selectorSuffix" : "", | ||
77 | "styles" : { | 82 | "styles" : { |
78 | "-webkit-transition": "all 0.4s ease-in" | 83 | "-webkit-transition": "all 0.4s ease-in" |
79 | } | 84 | } |
@@ -87,6 +92,7 @@ exports.transitionPresets = { | |||
87 | "text": "Scale Up", | 92 | "text": "Scale Up", |
88 | "selectorBase" : "scale-up", | 93 | "selectorBase" : "scale-up", |
89 | "rules" : [{ | 94 | "rules" : [{ |
95 | "selectorSuffix" : "", | ||
90 | "styles" : { | 96 | "styles" : { |
91 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 97 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
92 | } | 98 | } |
@@ -101,6 +107,7 @@ exports.transitionPresets = { | |||
101 | "text": "Scale Down", | 107 | "text": "Scale Down", |
102 | "selectorBase" : "scale-down", | 108 | "selectorBase" : "scale-down", |
103 | "rules" : [{ | 109 | "rules" : [{ |
110 | "selectorSuffix" : "", | ||
104 | "styles" : { | 111 | "styles" : { |
105 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 112 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
106 | } | 113 | } |
@@ -115,6 +122,7 @@ exports.transitionPresets = { | |||