Template:Color box: Difference between revisions

use table instead of <div> to avoid line break
(Changed <span> to <div>; allow text to be in color box)
(use table instead of <div> to avoid line break)
Line 1:
<noinclude>{{merge|Colorsample|Template talk:Colorsample#Merge proposal}}</noinclude><div style="background-color:{{{1}}}; width:16px; border:1px solid #000000; text-align:center">{{#if:{{{2|}}}|{{{2}}}|&nbsp;}}</div>
{| style="background-color:{{{1}}}; width:16px; line-height:12px; border:1px solid #000000; text-align:center"
|-
| {{#if:{{{2|}}}|{{{2}}}|&nbsp;}}
|}