diff options
| author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
| commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
| tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/ui | |
| parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
| parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
| download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/ui')
4 files changed, 15 insertions, 17 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 8f10092d..647f7e79 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html | |||
| @@ -23,13 +23,11 @@ | |||
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> | 25 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> |
| 26 | <div id="colorChipContainer" class="colortoolbar"> | 26 | <div data-montage-id="colorChipContainer" class="colortoolbar"> |
| 27 | 27 | <div data-montage-id="chipIcon"></div> | |
| 28 | <div id="chipIcon"></div> | 28 | <div class="chipContainer"> |
| 29 | 29 | <button data-montage-id="chipButton"></button> | |
| 30 | <div class="chipContainer"><button id="chipButton"></button></div> | 30 | </div> |
| 31 | |||
| 32 | </div> | 31 | </div> |
| 33 | |||
| 34 | </body> | 32 | </body> |
| 35 | </html> \ No newline at end of file | 33 | </html> \ No newline at end of file |
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html index 0c3c465e..735f970c 100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | </script> | 22 | </script> |
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <div id="fileInput" class="fileInput"> | 25 | <div data-montage-id="fileInput" class="fileInput"> |
| 26 | <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> | 26 | <input data-montage-id="fileInputTextField" class="file-path nj-skinned" type="text" /> |
| 27 | <input id="fileInputControl" class="browse-button" type="file" /> | 27 | <input data-montage-id="fileInputControl" class="browse-button" type="file" /> |
| 28 | </div> | 28 | </div> |
| 29 | </body> | 29 | </body> |
| 30 | </html> \ No newline at end of file | 30 | </html> \ No newline at end of file |
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index 4cdb4e69..ba85c089 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html | |||
| @@ -65,9 +65,9 @@ | |||
| 65 | </script> | 65 | </script> |
| 66 | </head> | 66 | </head> |
| 67 | <body> | 67 | <body> |
| 68 | <div id="inputRow" class="inputRow" style="-webkit-user-select: none;"> | 68 | <div data-montage-id="inputRow" class="inputRow" style="-webkit-user-select: none;"> |
| 69 | <div id="inputList"> | 69 | <div data-montage-id="inputList"> |
| 70 | <div id="inputPair"></div> | 70 | <div data-montage-id="inputPair"></div> |
| 71 | </div> | 71 | </div> |
| 72 | </div> | 72 | </div> |
| 73 | </body> | 73 | </body> |
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index d85cb0e3..0535ea5f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html | |||
| @@ -28,10 +28,10 @@ | |||
| 28 | </script> | 28 | </script> |
| 29 | </head> | 29 | </head> |
| 30 | <body> | 30 | <body> |
| 31 | <div id="propControl" class="propControl"> | 31 | <div data-montage-id="propControl" class="propControl"> |
| 32 | <div id="propLabel" class="prop-label"></div> | 32 | <div data-montage-id="propLabel" class="prop-label"></div> |
| 33 | <div id="propController" class="prop-controller"> | 33 | <div data-montage-id="propController" class="prop-controller"> |
| 34 | <div id="subDummy"></div> | 34 | <div data-montage-id="subDummy"></div> |
| 35 | </div> | 35 | </div> |
| 36 | </div> | 36 | </div> |
| 37 | </body> | 37 | </body> |