aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/position-and-size.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/properties.reel/sections/position-and-size.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/properties.reel/sections/position-and-size.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html33
1 files changed, 14 insertions, 19 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
index f50724c5..a7aac84e 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
+++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
@@ -10,8 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
10 <script type="text/montage-serialization"> 10 <script type="text/montage-serialization">
11 { 11 {
12 "owner": { 12 "owner": {
13 "module" : "js/panels/properties.reel/sections/position-and-size.reel", 13 "prototype" : "js/panels/properties.reel/sections/position-and-size.reel[PosSize]",
14 "name" : "PosSize",
15 "properties" : { 14 "properties" : {
16 "element" : {"#": "section"}, 15 "element" : {"#": "section"},
17 "position": {"#": "position"}, 16 "position": {"#": "position"},
@@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
25 } 24 }
26 }, 25 },
27 "PosX": { 26 "PosX": {
28 "module": "js/components/hottextunit.reel", 27 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
29 "name": "HotTextUnit",
30 "properties": { 28 "properties": {
31 "element": {"#": "PosX"}, 29 "element": {"#": "PosX"},
32 "maxValue": 10000, 30 "maxValue": 10000,
@@ -41,8 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
41 } 39 }
42 }, 40 },
43 "PosY": { 41 "PosY": {
44 "module": "js/components/hottextunit.reel", 42 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
45 "name": "HotTextUnit",
46 "properties": { 43 "properties": {
47 "element": {"#": "PosY"}, 44 "element": {"#": "PosY"},
48 "maxValue": 10000, 45 "maxValue": 10000,
@@ -57,8 +54,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
57 } 54 }
58 }, 55 },
59 "PosH": { 56 "PosH": {
60 "module": "js/components/hottextunit.reel", 57 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
61 "name": "HotTextUnit",
62 "properties": { 58 "properties": {
63 "element": {"#": "PosH"} 59 "element": {"#": "PosH"}
64 }, 60 },
@@ -71,8 +67,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
71 } 67 }
72 }, 68 },
73 "PosW": { 69 "PosW": {
74 "module": "js/components/hottextunit.reel", 70 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
75 "name": "HotTextUnit",
76 "properties": { 71 "properties": {
77 "element": {"#": "PosW"} 72 "element": {"#": "PosW"}
78 }, 73 },
@@ -97,33 +92,33 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
97 </script> 92 </script>
98</head> 93</head>
99<body> 94<body>
100 <div id="section" class="sectional"> 95 <div data-montage-id="section" class="sectional">
101 <section id="position" class="fieldCol"> 96 <section data-montage-id="position" class="fieldCol">
102 <label id="labelX">Left:</label> 97 <label data-montage-id="labelX">Left:</label>
103 <article class="fieldRow twoCol"> 98 <article class="fieldRow twoCol">
104 <div> 99 <div>
105 <div class="inputField"> 100 <div class="inputField">
106 <div id="PosX"></div> 101 <div data-montage-id="PosX"></div>
107 </div> 102 </div>
108 </div> 103 </div>
109 <div> 104 <div>
110 <div> 105 <div>
111 <label id="labelY">Top:</label> 106 <label data-montage-id="labelY">Top:</label>
112 </div> 107 </div>
113 <div class="inputField"> 108 <div class="inputField">
114 <div id="PosY"></div> 109 <div data-montage-id="PosY"></div>
115 </div> 110 </div>
116 </div> 111 </div>
117 </article> 112 </article>
118 </section> 113 </section>
119 <hr /> 114 <hr />
120 <section class="fieldCol"> 115 <section class="fieldCol">
121 <button id="posBound" class="unlock"></button> 116 <button data-montage-id="posBound" id="posBound" class="unlock"></button>
122 <label>Width:</label> 117 <label>Width:</label>
123 <article class="fieldRow twoCol"> 118 <article class="fieldRow twoCol">
124 <div> 119 <div>
125 <div class="inputField"> 120 <div class="inputField">
126 <div id="PosW"></div> 121 <div data-montage-id="PosW"></div>
127 </div> 122 </div>
128 </div> 123 </div>
129 <div> 124 <div>
@@ -131,7 +126,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
131 <label>Height:</label> 126 <label>Height:</label>
132 </div> 127 </div>
133 <div class="inputField"> 128 <div class="inputField">
134 <div id="PosH"></div> 129 <div data-montage-id="PosH"></div>
135 </div> 130 </div>
136 </div> 131 </div>
137 </article> 132 </article>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 11:53:17 +0000