diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/Timeline/Style.reel/Style.html | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-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/Timeline/Style.reel/Style.html')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 9fb098de..5be159c3 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html | |||
| @@ -65,23 +65,23 @@ | |||
| 65 | </script> | 65 | </script> |
| 66 | </head> | 66 | </head> |
| 67 | <body> | 67 | <body> |
| 68 | <div id="style-container"> | 68 | <div data-montage-id="style-container"> |
| 69 | <div class="style-padding"> | 69 | <div class="style-padding"> |
| 70 | <div class="row-hintable hidden"> | 70 | <div class="row-hintable hidden"> |
| 71 | <div id="style-hintable"></div> | 71 | <div data-montage-id="style-hintable"></div> |
| 72 | </div> | 72 | </div> |
| 73 | <div class="container-propvals hidden"> | 73 | <div class="container-propvals hidden"> |
| 74 | <div class="cell-property"> | 74 | <div class="cell-property"> |
| 75 | <div id="container-property">property</div> | 75 | <div data-montage-id="container-property">property</div> |
| 76 | </div> | 76 | </div> |
| 77 | <div class="cell-value value-editor editor-hottext hidden"> | 77 | <div class="cell-value value-editor editor-hottext hidden"> |
| 78 | <div id="value-editor-hottext"></div> | 78 | <div data-montage-id="value-editor-hottext"></div> |
| 79 | </div> | 79 | </div> |
| 80 | <div class="cell-value value-editor editor-color hidden"> | 80 | <div class="cell-value value-editor editor-color hidden"> |
| 81 | <div id="value-editor-color">[ ]</div> | 81 | <div data-montage-id="value-editor-color">[ ]</div> |
| 82 | </div> | 82 | </div> |
| 83 | <div class="cell-value value-editor editor-input hidden"> | 83 | <div class="cell-value value-editor editor-input hidden"> |
| 84 | <!-- <div id="value-editor-input"></div> --> | 84 | <!-- <div data-montage-id="value-editor-input"></div> --> |
| 85 | <input type="text" class="nj-skinned" value="" /> | 85 | <input type="text" class="nj-skinned" value="" /> |
| 86 | </div> | 86 | </div> |
| 87 | </div> | 87 | </div> |