aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 12:42:16 -0700
committerKris Kowal2012-07-06 15:01:49 -0700
commit6803c0abd279fcb640c38b3881b751bab982cbe0 (patch)
tree876211d178954cbaa73e0fbb658fe0c6ffb7ac8d /js/panels/Timeline/TimelinePanel.reel
parent3644cb6def4f681c99959e5729e78ea353441fad (diff)
downloadninja-6803c0abd279fcb640c38b3881b751bab982cbe0.tar.gz
Remove trailing spaces
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html16
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss2
2 files changed, 9 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 29701e8e..e5aff4bf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
32 <head> 32 <head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css"> 34 <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css">
35 35
36 36
37 <script type="text/montage-serialization"> 37 <script type="text/montage-serialization">
38 { 38 {
@@ -77,7 +77,7 @@ POSSIBILITY OF SUCH DAMAGE.
77 } 77 }
78 }, 78 },
79 79
80 80
81 "repetition1": { 81 "repetition1": {
82 "prototype": "montage/ui/repetition.reel", 82 "prototype": "montage/ui/repetition.reel",
83 "properties": { 83 "properties": {
@@ -110,7 +110,7 @@ POSSIBILITY OF SUCH DAMAGE.
110 } 110 }
111 } 111 }
112 }, 112 },
113 113
114 "repetition2" : { 114 "repetition2" : {
115 "prototype": "montage/ui/repetition.reel", 115 "prototype": "montage/ui/repetition.reel",
116 "properties": { 116 "properties": {
@@ -141,7 +141,7 @@ POSSIBILITY OF SUCH DAMAGE.
141 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", 141 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding",
142 "oneway" : false 142 "oneway" : false
143 } 143 }
144 144
145 } 145 }
146 }, 146 },
147 147
@@ -177,7 +177,7 @@ POSSIBILITY OF SUCH DAMAGE.
177 177
178 </head> 178 </head>
179 <body> 179 <body>
180 180
181 <div data-montage-id="timeline_panel" class="tl_container"> 181 <div data-montage-id="timeline_panel" class="tl_container">
182 182
183 <div data-montage-id="bread_crumb"></div> 183 <div data-montage-id="bread_crumb"></div>
@@ -195,7 +195,7 @@ POSSIBILITY OF SUCH DAMAGE.
195 </div> 195 </div>
196 196
197 197
198 198
199 <div data-montage-id="user_layers" class="userlayers"> 199 <div data-montage-id="user_layers" class="userlayers">
200 <div data-montage-id="master_layer" class="masterlayer"> 200 <div data-montage-id="master_layer" class="masterlayer">
201 <div class="layer-master">Master Layer 201 <div class="layer-master">Master Layer
@@ -206,7 +206,7 @@ POSSIBILITY OF SUCH DAMAGE.
206 <div class="checkable" data-montage-id="checkable_visible">Visibility of Layers</div> 206 <div class="checkable" data-montage-id="checkable_visible">Visibility of Layers</div>
207 </div> 207 </div>
208 </div> 208 </div>
209 209
210 </div> 210 </div>
211 211
212 </div> 212 </div>
@@ -248,7 +248,7 @@ POSSIBILITY OF SUCH DAMAGE.
248 </div> 248 </div>
249 249
250 <div class="timeline-disabled" data-montage-id="timeline-disabler"></div> 250 <div class="timeline-disabled" data-montage-id="timeline-disabler"></div>
251 251
252 </div> 252 </div>
253 </div> 253 </div>
254 254
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 470b5419..eafa9dd6 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
33/* TimelinePanel.scss 33/* TimelinePanel.scss
34 * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css. 34 * Main SCSS file for TimelinePanel component, compiled by SASS into the file css/TimelinePanel.css.
35 */ 35 */
36 36
37// Import theme settings 37// Import theme settings
38@import "../../../../../scss/imports/themes/default/colors"; 38@import "../../../../../scss/imports/themes/default/colors";
39// @import "../../../../../scss/imports/themes/default/fonts"; 39// @import "../../../../../scss/imports/themes/default/fonts";