diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-18 10:32:19 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-18 10:32:19 +0200 |
| commit | 667ccbcffb51391ecafe2c9be3341ff38075044d (patch) | |
| tree | c01f8b5ed62a80f8b0ed9ae5451b5f76dbcfd24c /phpBB | |
| parent | 852b707b48cef513318d52db1d2a5f40621636d6 (diff) | |
| parent | d9a9083d9093bb2f63e143a88f13f852604cc639 (diff) | |
| download | forums-667ccbcffb51391ecafe2c9be3341ff38075044d.tar forums-667ccbcffb51391ecafe2c9be3341ff38075044d.tar.gz forums-667ccbcffb51391ecafe2c9be3341ff38075044d.tar.bz2 forums-667ccbcffb51391ecafe2c9be3341ff38075044d.tar.xz forums-667ccbcffb51391ecafe2c9be3341ff38075044d.zip | |
Merge remote-tracking branch 'prototech/ticket/10948' into develop
* prototech/ticket/10948:
[ticket/10948] Separate color swatch cells.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 4c70ee345f..66a3cb51ac 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -311,7 +311,7 @@ function colorPalette(dir, width, height) { numberList[3] = 'BF'; numberList[4] = 'FF'; - html += '<table cellspacing="1" cellpadding="0" border="0">'; + html += '<table>'; for (r = 0; r < 5; r++) { if (dir == 'h') { @@ -325,7 +325,7 @@ function colorPalette(dir, width, height) { for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - html += '<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'; + html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">'; html += '<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>'; html += '</td>'; } diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 34f8bc8c32..adb8c5e521 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -232,6 +232,11 @@ fieldset.submit-buttons input { /* Posting page styles ----------------------------------------*/ +#colour_palette table { + border-collapse: separate; + border-spacing: 1px; +} + /* Buttons used in the editor */ #format-buttons { margin: 15px 0 2px 0; |