diff options
| author | Cesar G <prototech91@gmail.com> | 2013-10-18 21:23:53 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-12 18:11:56 -0800 |
| commit | 79b5e9689617df62030be13f8b9912aee32e7bcb (patch) | |
| tree | faefca092b7b088a8eeb183e94c55943f12102a7 /phpBB | |
| parent | c386bf7911edfc4613c6a70dae37db76bfe645cb (diff) | |
| download | forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.gz forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.bz2 forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.xz forums-79b5e9689617df62030be13f8b9912aee32e7bcb.zip | |
[ticket/11472] Make the color swatch configurable and fix it in subsilver2
PHPBB3-11472
Diffstat (limited to 'phpBB')
6 files changed, 14 insertions, 20 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 66a3cb51ac..418dd163aa 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -346,7 +346,11 @@ function colorPalette(dir, width, height) { (function($) { $(document).ready(function() { $('#color_palette_placeholder').each(function() { - $(this).html(colorPalette('h', 15, 12)); + var orientation = $(this).attr('data-orientation'), + height = $(this).attr('data-height'), + width = $(this).attr('data-width'); + + $(this).html(colorPalette(orientation, width, height)); }); }); })(jQuery); diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index b4b02d3f00..232f033b5f 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"></dd> + <dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15"></dd> </dl> </div> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 7b77f85694..53e8e02d33 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -207,12 +207,7 @@ <tr> <td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td> <!-- IF S_BBCODE_ALLOWED --> - <td width="80" align="center" valign="top"> - <script type="text/javascript"> - // <![CDATA[ - colorPalette('v', 7, 6) - // ]]> - </script> + <td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="7" data-height="6"> </td> <!-- ENDIF --> </tr> diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html index 8e18e9cabf..96af9c44e4 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html @@ -75,12 +75,7 @@ <td colspan="9"> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr> - <td align="{S_CONTENT_FLOW_BEGIN}"> - <script type="text/javascript"> - // <![CDATA[ - colorPalette('h', 6, 5) - // ]]> - </script> + <td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6"> </td> </tr> </table> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index 85c8b0f616..4ed3287b39 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -61,12 +61,7 @@ <td colspan="2"> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr> - <td align="{S_CONTENT_FLOW_BEGIN}"> - <script type="text/javascript"> - // <![CDATA[ - colorPalette('h', 6, 5) - // ]]> - </script> + <td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6"> </td> </tr> </table> diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 7d14376454..22a3ada275 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -303,6 +303,11 @@ p.topicdetails { /* Tables ------------ */ +#color_palette_placeholder table { + border-collapse: separate; + border-spacing: 1px; +} + th { color: #FFA34F; font-size: 1.1em; |