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/components/ui/color-chip.reel | |
| 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/components/ui/color-chip.reel')
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.html | 12 |
1 files changed, 5 insertions, 7 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 |