makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11472] Make the color swatch configurable and fix it in subsilver2

Browse source 
PHPBB3-11472
This commit is contained in:
Cesar G 2013-10-18 21:23:53 -07:00
parent c386bf7911
commit 79b5e96896
6 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/assets/javascript/editor.js
View file

@ -346,7 +346,11 @@ function colorPalette(dir, width, height) {
(function($) { (function($) {
$(document).ready(function() { $(document).ready(function() {
$('#color_palette_placeholder').each(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); })(jQuery);

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

@ -55,7 +55,7 @@
<div id="colour_palette" style="display: none;"> <div id="colour_palette" style="display: none;">
<dl style="clear: left;"> <dl style="clear: left;">
<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt> <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> </dl>
</div> </div>

7
phpBB/styles/subsilver2/template/posting_body.html
View file

@ -207,12 +207,7 @@
<tr> <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> <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 --> <!-- IF S_BBCODE_ALLOWED -->
<td width="80" align="center" valign="top"> <td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="7" data-height="6">
<script type="text/javascript">
// <![CDATA[
colorPalette('v', 7, 6)
// ]]>
</script>
</td> </td>
<!-- ENDIF --> <!-- ENDIF -->
</tr> </tr>

7
phpBB/styles/subsilver2/template/ucp_main_drafts.html
View file

@ -75,12 +75,7 @@
<td colspan="9"> <td colspan="9">
<table cellspacing="0" cellpadding="0" border="0" width="100%"> <table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr> <tr>
<td align="{S_CONTENT_FLOW_BEGIN}"> <td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
<script type="text/javascript">
// <![CDATA[
colorPalette('h', 6, 5)
// ]]>
</script>
</td> </td>
</tr> </tr>
</table> </table>

7
phpBB/styles/subsilver2/template/ucp_profile_signature.html
View file

@ -61,12 +61,7 @@
<td colspan="2"> <td colspan="2">
<table cellspacing="0" cellpadding="0" border="0" width="100%"> <table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr> <tr>
<td align="{S_CONTENT_FLOW_BEGIN}"> <td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
<script type="text/javascript">
// <![CDATA[
colorPalette('h', 6, 5)
// ]]>
</script>
</td> </td>
</tr> </tr>
</table> </table>

5
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -303,6 +303,11 @@ p.topicdetails {
/* Tables /* Tables
------------ */ ------------ */
#color_palette_placeholder table {
border-collapse: separate;
border-spacing: 1px;
}
th { th {
color: #FFA34F; color: #FFA34F;
font-size: 1.1em; font-size: 1.1em;