From fd423d5a7a665e465f8b9e4a3f3d3ecdaf99dd3b Mon Sep 17 00:00:00 2001 From: Louis7777 Date: Wed, 3 May 2017 02:58:05 +0300 Subject: [PATCH 1/5] [ticket/15212] Fix code box double horizontal scrollbars The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212 --- phpBB/styles/prosilver/theme/content.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 95168d1d97..c6914e8541 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -491,18 +491,17 @@ blockquote cite > div { /* Code block */ .codebox { - padding: 3px; border: 1px solid transparent; font-size: 1em; margin: 1em 0 1.2em 0; - overflow-x: scroll; word-wrap: normal; } .codebox p { text-transform: uppercase; border-bottom: 1px solid transparent; - margin-bottom: 3px; + margin-bottom: 0; + padding: 3px 3px 0 3px; font-size: 0.8em !important; font-weight: bold; display: block; @@ -517,10 +516,9 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - padding-top: 5px; + padding: 5px 3px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; line-height: 1.3em; - margin: 2px 0; } /* Attachments From 234a6f1256e9eb9feebd103ddfdf0956f75cffc6 Mon Sep 17 00:00:00 2001 From: Louis7777 Date: Wed, 3 May 2017 03:30:16 +0300 Subject: [PATCH 2/5] Update content.css --- phpBB/styles/prosilver/theme/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index c6914e8541..78ecb23568 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -516,7 +516,7 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - padding: 5px 3px; + padding: 8px 3px 5px 3px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; line-height: 1.3em; } From 3e971bd1f8463e0e3d416b891458af55c24077b8 Mon Sep 17 00:00:00 2001 From: Louis7777 Date: Wed, 3 May 2017 04:00:33 +0300 Subject: [PATCH 3/5] [ticket/15212] Fix code box double horizontal scrollbars The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212 --- phpBB/styles/prosilver/theme/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 78ecb23568..058f0178d1 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -516,7 +516,7 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - padding: 8px 3px 5px 3px; + padding: 8px 3px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; line-height: 1.3em; } From cc40d64e2488d2a33ced9ca3e3201b37e3041aaa Mon Sep 17 00:00:00 2001 From: Louis7777 Date: Wed, 3 May 2017 04:04:27 +0300 Subject: [PATCH 4/5] [ticket/15212] Fix code box double horizontal scrollbars The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212 --- phpBB/styles/prosilver/theme/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 058f0178d1..c6914e8541 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -516,7 +516,7 @@ blockquote .codebox { display: block; height: auto; max-height: 200px; - padding: 8px 3px; + padding: 5px 3px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; line-height: 1.3em; } From 0c79cdcb31a66b89963008e88fd3b15f7e952489 Mon Sep 17 00:00:00 2001 From: Louis7777 Date: Thu, 4 May 2017 20:04:11 +0300 Subject: [PATCH 5/5] [ticket/15212] Fix code box double horizontal scrollbars The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212 --- phpBB/styles/prosilver/theme/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index c6914e8541..97037dfcc9 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -501,7 +501,7 @@ blockquote cite > div { text-transform: uppercase; border-bottom: 1px solid transparent; margin-bottom: 0; - padding: 3px 3px 0 3px; + padding: 3px; font-size: 0.8em !important; font-weight: bold; display: block;