diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-13 01:24:37 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-13 01:24:37 -0800 |
| commit | c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20 (patch) | |
| tree | b67c6de14f7c06498ea9c769d4f405b7d30969f7 /phpBB/styles/prosilver | |
| parent | 9a9669bebd3edcb3dde7459660eece3a73856cf6 (diff) | |
| download | forums-c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20.tar forums-c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20.tar.gz forums-c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20.tar.bz2 forums-c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20.tar.xz forums-c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20.zip | |
[ticket/10810] Update all palettes.
PHPBB3-10810
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_buttons.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_groups_manage.html | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index aa269058cc..c5cdfad156 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -55,7 +55,7 @@ <div id="colour_palette" style="display: none;"> <dl style="clear: left;"> <dt><label>{L_FONT_COLOR}{L_COLON}</label></dt> - <dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15"></dd> + <dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd> </dl> </div> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 019b5aa3e1..eb431e9f3f 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -54,7 +54,12 @@ <fieldset> <dl> <dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> - <dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};"> </span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd> + <dd> + <input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> + <span style="background-color: {GROUP_COLOUR};"> </span> + [ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ] + <div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> + </dd> </dl> <dl> <dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt> 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; |