aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
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/presets
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/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html4
-rw-r--r--js/panels/presets/content.reel/content.html12
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html7
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html4
4 files changed, 13 insertions, 14 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index d333cf97..347e5497 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.html
+++ b/js/panels/presets/animations-presets.reel/animations-presets.html
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 48 </script>
49</head> 49</head>
50<body> 50<body>
51<section id="animationsLibrary" class="animationsLibrary"> 51<section data-montage-id="animationsLibrary" class="animationsLibrary">
52 <div id="libraryContainer"></div> 52 <div data-montage-id="libraryContainer"></div>
53</section> 53</section>
54</body> 54</body>
55</html> \ No newline at end of file 55</html> \ No newline at end of file
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 27928670..50a48389 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
55 </script> 55 </script>
56</head> 56</head>
57<body> 57<body>
58 <section id="presetsPanel" class="presetsPanel"> 58 <section data-montage-id="presetsPanel" class="presetsPanel">
59 <nav id="tab-bar" class="tab-bar"> 59 <nav data-montage-id="tab-bar" class="tab-bar">
60 <div id="styles">Styles</div> 60 <div data-montage-id="styles">Styles</div>
61 <div id="transitions">Transitions</div> 61 <div data-montage-id="transitions">Transitions</div>
62 <div id="animations">Animations</div> 62 <div data-montage-id="animations">Animations</div>
63 </nav> 63 </nav>
64 <div id="librarySlot" class="librarySlot"></div> 64 <div data-montage-id="librarySlot" class="librarySlot"></div>
65 </section> 65 </section>
66</body> 66</body>
67</html> \ No newline at end of file 67</html> \ No newline at end of file
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 7490a73b..a3d718bb 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -13,8 +13,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
13 "owner": { 13 "owner": {
14 "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]", 14 "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]",
15 "properties" : { 15 "properties" : {
16 "element" : {"#" : "stylesLibrary"}, 16 "element" : {"#" : "stylesLibrary"}
17 "treeList" : {"@" : "treeList"}
18 } 17 }
19 }, 18 },
20 "presetsController" : { 19 "presetsController" : {
@@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 47 </script>
49</head> 48</head>
50<body> 49<body>
51<section id="stylesLibrary" class="stylesLibrary"> 50<section data-montage-id="stylesLibrary" class="stylesLibrary">
52 <div id="libraryContainer"></div> 51 <div data-montage-id="libraryContainer"></div>
53</section> 52</section>
54</body> 53</body>
55</html> \ No newline at end of file 54</html> \ No newline at end of file
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index 2f084463..a6b98aeb 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 48 </script>
49</head> 49</head>
50<body> 50<body>
51<section id="transitionsLibrary" class="transitionsLibrary"> 51<section data-montage-id="transitionsLibrary" class="transitionsLibrary">
52 <div id="libraryContainer"></div> 52 <div data-montage-id="libraryContainer"></div>
53</section> 53</section>
54</body> 54</body>
55</html> \ No newline at end of file 55</html> \ No newline at end of file