diff options
| -rw-r--r-- | phpBB/assets/javascript/core.js | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 54c807a87c..ab0891e70c 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -510,11 +510,11 @@ $('#notification_list_button').click(function(e) { e.preventDefault(); }); $('#phpbb').click(function(e) { - var target = $(e.target); + var target = $(e.target); - if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) { - $('#notification_list').hide(); - } + if (!target.is('#notification_list, #notification_list_button') && !target.parents().is('#notification_list, #notification_list_button')) { + $('#notification_list').hide(); + } }); phpbb.ajaxCallbacks = {}; diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index eac958b4ee..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') { 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; |