From 5ef55d9e450c1e10f180427d8177deafee3e6567 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sun, 16 Feb 2014 13:25:01 -0800 Subject: [PATCH 1/3] [ticket/12080] Add classes to color palette table to identify it more easily. PHPBB3-12080 --- phpBB/assets/javascript/core.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 += ''; + var table_class = (dir == 'h') ? 'horizontal-palette' : 'vertical-palette'; + html += '
'; for (r = 0; r < 5; r++) { if (dir == 'h') { From bfbf0fefbfb6d2d08c06ee2fe7826e0143948db1 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sun, 16 Feb 2014 13:27:01 -0800 Subject: [PATCH 2/3] [ticket/12080] Reduce the palette options in all locations when responsive. PHPBB3-12080 --- phpBB/adm/style/admin.css | 8 ++++++++ phpBB/styles/prosilver/theme/responsive.css | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index aa8622ff61..ea5dc6aec6 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 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; } From b8c836836bf74eacf4c7812013301e11b0688c62 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sun, 16 Feb 2014 13:27:48 -0800 Subject: [PATCH 3/3] [ticket/12080] Stop responsive ACP sig textarea from dropping to second line. PHPBB3-12080 --- phpBB/adm/style/acp_users_signature.html | 2 +- phpBB/adm/style/admin.css | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 @@ -
+
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index ea5dc6aec6..51845e2845 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1361,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; @@ -1427,6 +1431,10 @@ input:focus, textarea:focus { width: auto; } + fieldset .responsive-columns dt { + float: left; + } + .ltr fieldset dd { padding-left: 20px; }