mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-24 17:22:55 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1869 from prototech/ticket/10810

Browse Source 
[ticket/10810] Move color swatches from popup windows to inline blocks.
This commit is contained in:
Nathan Guse
2013-11-21 13:41:03 -08:00
parent 20885ccb8c 97915b467e
commit 6f419b0049
15 changed files with 117 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/posting_buttons.html
View File

@@ -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>

7
phpBB/styles/prosilver/template/ucp_groups_manage.html
View File

@@ -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};">&nbsp;&nbsp;&nbsp;</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};">&nbsp;&nbsp;&nbsp;</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>

5
phpBB/styles/prosilver/theme/common.css
View File

@@ -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

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

@@ -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;