diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:41:03 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:41:03 -0800 |
| commit | 6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4 (patch) | |
| tree | 940086df78617fc7d036d631eb5b4eb820e09b7c /phpBB/styles/prosilver/theme | |
| parent | 20885ccb8cef8d497ceacc232d3d864d5c07c455 (diff) | |
| parent | 97915b467ed2a0f15805b43155eb24ac8b326c35 (diff) | |
| download | forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.gz forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.bz2 forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.xz forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.zip | |
Merge pull request #1869 from prototech/ticket/10810
[ticket/10810] Move color swatches from popup windows to inline blocks.
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 225673a932..de55b8188f 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -631,6 +631,11 @@ table.info tbody th { margin: 0 -1px; } +#color_palette_placeholder table { + border-collapse: separate; + border-spacing: 1px; +} + /* Misc layout styles ---------------------------------------- */ /* column[1-2] styles are containers for two column layouts diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 1ee364ce93..755ce4a19d 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -235,11 +235,6 @@ 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; |