Template:Color box: Difference between revisions

reverted to <span>; still allowed text as second parameter; added syntax example
(use table instead of <div> to avoid line break)
(reverted to <span>; still allowed text as second parameter; added syntax example)
Line 1:
<noinclude>{{merge|Colorsample|Template talk:Colorsample#Merge proposal}}</noinclude><span style="background-color:{{{1}}}; border:1px solid #000000; text-align:center;">{{#if:{{{2|}}}|{{{2}}}|&nbsp;&nbsp;&nbsp;&nbsp;}}</span><noinclude>
'''Syntax:'''
{| style="background-color:{{{1}}}; width:16px; line-height:12px; border:1px solid #000000; text-align:center"
''<nowiki>{{color box|color|text}}</nowiki>''</noinclude>
|-
| {{#if:{{{2|}}}|{{{2}}}|&nbsp;}}
|}