diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-20 20:59:14 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-20 20:59:14 -0600 |
| commit | 4f6b9080e8c997eac0644ede70a19b99914102ee (patch) | |
| tree | 2ffc0db05c995bc82f3bb05a81f9ab4f33a94399 /phpBB | |
| parent | 2df2032b4877ea59412bff80a5b54a7ea6aeb8b8 (diff) | |
| parent | b8c836836bf74eacf4c7812013301e11b0688c62 (diff) | |
| download | forums-4f6b9080e8c997eac0644ede70a19b99914102ee.tar forums-4f6b9080e8c997eac0644ede70a19b99914102ee.tar.gz forums-4f6b9080e8c997eac0644ede70a19b99914102ee.tar.bz2 forums-4f6b9080e8c997eac0644ede70a19b99914102ee.tar.xz forums-4f6b9080e8c997eac0644ede70a19b99914102ee.zip | |
Merge pull request #2037 from prototech/ticket/12080
[ticket/12080] Fix color palettes when responsive.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_users_signature.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 16 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 8 |
4 files changed, 23 insertions, 6 deletions
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index fff75c993d..5b5c3ecf7f 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -87,7 +87,7 @@ </div> <!-- EVENT acp_users_signature_editor_buttons_after --> - <dl> + <dl class="responsive-columns"> <dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true"> </dt> <dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 642d4e420e..3c7e378b2b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1045,6 +1045,14 @@ table.styles td.users, table td.mark { table.responsive.styles td:first-child > dfn, table.responsive td.actions > dfn { display: none !important; } + + .horizontal-palette td:nth-child(2n), .vertical-palette tr:nth-child(2n) { + display: none; + } + + .colour-palette a { + display: inline-block !important; + } } /* General form styles @@ -1353,6 +1361,10 @@ fieldset dt { border-left: 1px solid #CCCCCC; } +fieldset #color_palette_placeholder { + padding-top: 0; +} + fieldset dd { margin: 0 0 0 45%; padding: 0 0 0 5px; @@ -1419,6 +1431,10 @@ input:focus, textarea:focus { width: auto; } + fieldset .responsive-columns dt { + float: left; + } + .ltr fieldset dd { padding-left: 20px; } diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 5b8331bdce..4657af90ab 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -994,7 +994,8 @@ phpbb.colorPalette = function(dir, width, height) { numberList[3] = 'BF'; numberList[4] = 'FF'; - html += '<table style="width: auto;">'; + var table_class = (dir == 'h') ? 'horizontal-palette' : 'vertical-palette'; + html += '<table class="not-responsive colour-palette ' + table_class + '" style="width: auto;">'; for (r = 0; r < 5; r++) { if (dir == 'h') { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index bfa2448296..a6bc52db52 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -303,20 +303,20 @@ dl.pmlist dd:first-of-type { display: none; } -#colour_palette table, #colour_palette tbody, #colour_palette tr { +.colour-palette, .colour-palette tbody, .colour-palette tr { display: block; } -#colour_palette td { +.colour-palette td { display: inline-block; margin-right: 2px; } -#colour_palette td:nth-child(2n) { +.horizontal-palette td:nth-child(2n), .vertical-palette tr:nth-child(2n) { display: none; } -#colour_palette a { +.colour-palette a { display: inline-block !important; } |