makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prototech/ticket/10948' into develop

Browse source 
* prototech/ticket/10948:
  [ticket/10948] Separate color swatch cells.
This commit is contained in:
Joas Schilling 2013-10-18 10:32:19 +02:00
commit 667ccbcffb
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/styles/prosilver/template/editor.js
View file

@ -311,7 +311,7 @@ function colorPalette(dir, width, height) {
numberList[3] = 'BF'; numberList[3] = 'BF';
numberList[4] = 'FF'; numberList[4] = 'FF';
html += '<table cellspacing="1" cellpadding="0" border="0">'; html += '<table>';
for (r = 0; r < 5; r++) { for (r = 0; r < 5; r++) {
if (dir == 'h') { if (dir == 'h') {
@ -325,7 +325,7 @@ function colorPalette(dir, width, height) {
for (b = 0; b < 5; b++) { for (b = 0; b < 5; b++) {
color = String(numberList[r]) + String(numberList[g]) + String(numberList[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 += '<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>'; html += '</td>';
} }

5
phpBB/styles/prosilver/theme/forms.css
View file

@ -232,6 +232,11 @@ fieldset.submit-buttons input {
/* Posting page styles /* Posting page styles
----------------------------------------*/ ----------------------------------------*/
#colour_palette table {
border-collapse: separate;
border-spacing: 1px;
}
/* Buttons used in the editor */ /* Buttons used in the editor */
#format-buttons { #format-buttons {
margin: 15px 0 2px 0; margin: 15px 0 2px 0;