diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/properties.reel/sections/custom-rows | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows')
3 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 990dc739..cef44f31 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |||
| @@ -38,11 +38,11 @@ | |||
| 38 | </script> | 38 | </script> |
| 39 | </head> | 39 | </head> |
| 40 | <body> | 40 | <body> |
| 41 | <div id="section"> | 41 | <div data-montage-id="section"> |
| 42 | <section class="fieldCol"> | 42 | <section class="fieldCol"> |
| 43 | <article class="fieldRow colorSelect"> | 43 | <article class="fieldRow colorSelect"> |
| 44 | <div id="Stroke"></div> | 44 | <div data-montage-id="Stroke"></div> |
| 45 | <div id="Fill"></div> | 45 | <div data-montage-id="Fill"></div> |
| 46 | </article> | 46 | </article> |
| 47 | </section> | 47 | </section> |
| 48 | </div> | 48 | </div> |
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index d1b5f28b..bdcbff7f 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
| @@ -44,17 +44,17 @@ | |||
| 44 | </script> | 44 | </script> |
| 45 | </head> | 45 | </head> |
| 46 | <body> | 46 | <body> |
| 47 | <div id="section"> | 47 | <div data-montage-id="section"> |
| 48 | <section class="fieldCol"> | 48 | <section class="fieldCol"> |
| 49 | <label class="lbl"></label> | 49 | <label class="lbl"></label> |
| 50 | <article class="fieldRow"> | 50 | <article class="fieldRow"> |
| 51 | <div id="slotElement" class="inputField"> | 51 | <div data-montage-id="slotElement" class="inputField"> |
| 52 | 52 | ||
| 53 | </div> | 53 | </div> |
| 54 | </article> | 54 | </article> |
| 55 | <label class="lbl"></label> | 55 | <label class="lbl"></label> |
| 56 | <article class="fieldRow"> | 56 | <article class="fieldRow"> |
| 57 | <div id="slotElement2" class="inputField"> | 57 | <div data-montage-id="slotElement2" class="inputField"> |
| 58 | 58 | ||
| 59 | </div> | 59 | </div> |
| 60 | </article> | 60 | </article> |
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index b606e5db..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
| @@ -31,11 +31,11 @@ | |||
| 31 | </script> | 31 | </script> |
| 32 | </head> | 32 | </head> |
| 33 | <body> | 33 | <body> |
| 34 | <div id="section"> | 34 | <div data-montage-id="section"> |
| 35 | <section class="fieldCol"> | 35 | <section class="fieldCol"> |
| 36 | <label><span class="lbl"></span></label> | 36 | <label><span class="lbl"></span></label> |
| 37 | <article class="fieldRow"> | 37 | <article class="fieldRow"> |
| 38 | <div id="slotElement" class="inputField"> | 38 | <div data-montage-id="slotElement" class="inputField"> |
| 39 | 39 | ||
| 40 | </div> | 40 | </div> |
| 41 | </article> | 41 | </article> |