aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/section.reel/section.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/properties.reel/section.reel/section.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/panels/properties.reel/section.reel/section.html')
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index e6f68751..c9b14565 100755
--- a/js/panels/properties.reel/section.reel/section.html
+++ b/js/panels/properties.reel/section.reel/section.html
@@ -36,12 +36,12 @@
36 </script> 36 </script>
37</head> 37</head>
38<body> 38<body>
39 <div id="section"> 39 <div data-montage-id="section">
40 <h2 id="sectionSplitter" class="subSectionHeader"> 40 <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
41 <section class="arrow"><div class="arrowIcon animated"></div></section> 41 <section class="arrow"><div class="arrowIcon animated"></div></section>
42 <section class="title"></section> 42 <section class="title"></section>
43 </h2> 43 </h2>
44 <div id="sectionSlot" class="animated"></div> 44 <div data-montage-id="sectionSlot" class="animated"></div>
45 </div> 45 </div>
46</body> 46</body>
47</html> \ No newline at end of file 47</html> \ No newline at end of file