diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | 6 |
1 files changed, 3 insertions, 3 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> |