From f78ba39a1c61cc69b5ecd725ffaa0252cc6d8431 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Thu, 23 Feb 2017 08:44:56 -0700 Subject: [PATCH 1/8] [ticket/15086] Replace quote.gif with Font Awesome icon Use the Font Awesome icon for a quote rather than the quote.gif file. I believe I've handled the RTL case as well. PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 10 +++++++++- phpBB/styles/prosilver/theme/colours.css | 5 ----- phpBB/styles/prosilver/theme/content.css | 9 ++++++++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f23af1b5fc..66a6451e27 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -502,10 +502,18 @@ li.breadcrumbs span:first-child > a { .rtl blockquote cite { /* Username/source of quoter */ - margin-right: 20px; + margin-right: 0px; margin-left: 0; } +blockquote cite:before { + /* Font Awesome quote-right */ + content: '\f10e'; + font-family: FontAwesome; + padding-right: 0px; + padding-left: 5px; +} + .rtl blockquote .codebox { margin-right: 0; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index cf21ac216b..0301404881 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -409,14 +409,9 @@ dl.faq dt { /* Quote block */ blockquote { background-color: #EBEADD; - background-image: url("./images/quote.gif"); border-color:#DBDBCE; } -.rtl blockquote { - background-image: url("./images/quote_rtl.gif"); -} - blockquote blockquote { /* Nested quotes */ background-color:#EFEED9; diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 95168d1d97..15f44ee476 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -466,11 +466,18 @@ blockquote cite { /* Username/source of quoter */ font-style: normal; font-weight: bold; - margin-left: 20px; + margin-left: 0px; display: block; font-size: 0.9em; } +blockquote cite:before { + /* Font Awesome quote-left */ + content: '\f10d'; + font-family: FontAwesome; + padding-right: 5px; +} + blockquote cite cite { font-size: 1em; } From 92fefcfe6fcaba5fa3f866432506101e21daca52 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Thu, 23 Feb 2017 22:33:43 -0700 Subject: [PATCH 2/8] [ticket/15086] corrections from vinny's review Changed instances of 0px; to 0; and add missing element PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 6 +++--- phpBB/styles/prosilver/theme/content.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 66a6451e27..3506e7f735 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -502,15 +502,15 @@ li.breadcrumbs span:first-child > a { .rtl blockquote cite { /* Username/source of quoter */ - margin-right: 0px; + margin-right: 0; margin-left: 0; } -blockquote cite:before { +.rtl blockquote cite:before { /* Font Awesome quote-right */ content: '\f10e'; font-family: FontAwesome; - padding-right: 0px; + padding-right: 0; padding-left: 5px; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 15f44ee476..3c4467cb19 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -466,7 +466,7 @@ blockquote cite { /* Username/source of quoter */ font-style: normal; font-weight: bold; - margin-left: 0px; + margin-left: 0; display: block; font-size: 0.9em; } From 4113fba04dff2f56201a7be35008b43e483c0d7d Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 24 Feb 2017 06:26:42 -0700 Subject: [PATCH 3/8] [ticket/15086] Handle the uncited case properly The blockquote uncited CSS needs the Font Awesome icon added as well PHPBB3-15086 --- phpBB/styles/prosilver/theme/content.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 3c4467cb19..9673079ee5 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -483,7 +483,14 @@ blockquote cite cite { } blockquote.uncited { - padding-top: 25px; + padding-top: 0; +} + +blockquote.uncited:before { + /* Font Awesome quote-left */ + content: '\f10d'; + font-family: FontAwesome; + padding-right: 5px; } blockquote cite > div { From 6bbb7581c29b6d74e9b0449451b1fa9601253c44 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Tue, 7 Mar 2017 20:50:51 -0700 Subject: [PATCH 4/8] [ticket/15086] Merge cite and uncited definitions Per hanakin's suggested changes, merged the cite and uncited definitions. Handle the uncited case in RTL languages. PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 3 +-- phpBB/styles/prosilver/theme/content.css | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 3506e7f735..e2698d146f 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -506,10 +506,9 @@ li.breadcrumbs span:first-child > a { margin-left: 0; } -.rtl blockquote cite:before { +.rtl blockquote cite:before, .uncited:before { /* Font Awesome quote-right */ content: '\f10e'; - font-family: FontAwesome; padding-right: 0; padding-left: 5px; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 9673079ee5..2ceb2b4613 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -471,7 +471,7 @@ blockquote cite { font-size: 0.9em; } -blockquote cite:before { +blockquote cite:before, .uncited:before { /* Font Awesome quote-left */ content: '\f10d'; font-family: FontAwesome; @@ -486,13 +486,6 @@ blockquote.uncited { padding-top: 0; } -blockquote.uncited:before { - /* Font Awesome quote-left */ - content: '\f10d'; - font-family: FontAwesome; - padding-right: 5px; -} - blockquote cite > div { float: right; font-weight: normal; From b56be33e5bc712f156400203f2c1e066ce434a71 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 10 Mar 2017 11:42:50 -0700 Subject: [PATCH 5/8] [ticket/15086] Refactoring and moving to icons.css Per hanakin's github suggestions some refactoring and moved icons into icons.css for conistency. The RTL icons remain in bidi.css to keep all the RTL content in a consistant location. A number of places where setting something to zero have been removed. PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 4 +--- phpBB/styles/prosilver/theme/content.css | 12 ------------ phpBB/styles/prosilver/theme/icons.css | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index e2698d146f..f2c2c01cc6 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -502,15 +502,13 @@ li.breadcrumbs span:first-child > a { .rtl blockquote cite { /* Username/source of quoter */ - margin-right: 0; margin-left: 0; } .rtl blockquote cite:before, .uncited:before { - /* Font Awesome quote-right */ - content: '\f10e'; padding-right: 0; padding-left: 5px; + content: '\f10e'; /* Font Awesome quote-right */ } .rtl blockquote .codebox { diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 2ceb2b4613..1043a23cd4 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -466,26 +466,14 @@ blockquote cite { /* Username/source of quoter */ font-style: normal; font-weight: bold; - margin-left: 0; display: block; font-size: 0.9em; } -blockquote cite:before, .uncited:before { - /* Font Awesome quote-left */ - content: '\f10d'; - font-family: FontAwesome; - padding-right: 5px; -} - blockquote cite cite { font-size: 1em; } -blockquote.uncited { - padding-top: 0; -} - blockquote cite > div { float: right; font-weight: normal; diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index 411fecaf3b..c4aabb2b0f 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -85,3 +85,20 @@ line-height: .9; height: 12px; } + + +blockquote cite:before, .uncited:before { + -webkit-font-smoothing: antialiased; + -mos-osx-font-smoothing: grayscale; + font-family: FontAwesome; + font-size: 14px; + font-weight: normal; + font-style: normal; + font-variant: normal; + line-height: 1; + text-rendering: auto; + display: inline-block; + padding-right: 5px; + content: '\f10d'; /* Font Awesome quote-left */ +} + From 605af49562f5573a0b29320eafa9202a834b82a8 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 10 Mar 2017 22:11:47 -0700 Subject: [PATCH 6/8] [ticket/15086] Move RTL Font Awesome icon to icons.css Per github discussion, move the RTL Font Awesome coding from bidi.css to icons.css. PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 6 ------ phpBB/styles/prosilver/theme/icons.css | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f2c2c01cc6..4f0eda7cff 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -505,12 +505,6 @@ li.breadcrumbs span:first-child > a { margin-left: 0; } -.rtl blockquote cite:before, .uncited:before { - padding-right: 0; - padding-left: 5px; - content: '\f10e'; /* Font Awesome quote-right */ -} - .rtl blockquote .codebox { margin-right: 0; } diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index c4aabb2b0f..4fcb0dc76c 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -102,3 +102,9 @@ blockquote cite:before, .uncited:before { content: '\f10d'; /* Font Awesome quote-left */ } +.rtl blockquote cite:before, .rtl .uncited:before { + padding-right: 0; + padding-left: 5px; + content: '\f10e'; /* Font Awesome quote-right */ +} + From 6da3b5e93d4c32da804956fcc9ae6246ce5968e7 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Mon, 13 Mar 2017 09:04:02 -0600 Subject: [PATCH 7/8] [ticket/15086] Rework specification of properties to simplify Once more rework the property specifications to maintain backwards compatability and keep changes as small as possible. Thanks hanakin for the assistance. PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 4 ++++ phpBB/styles/prosilver/theme/content.css | 4 ++++ phpBB/styles/prosilver/theme/icons.css | 15 +-------------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 4f0eda7cff..5b0cdb8cdd 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -505,6 +505,10 @@ li.breadcrumbs span:first-child > a { margin-left: 0; } +.rtl blockquote cite:before, .rtl .uncited:before { + padding-left: 5px; +} + .rtl blockquote .codebox { margin-right: 0; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 1043a23cd4..72d8e8bd3b 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -474,6 +474,10 @@ blockquote cite cite { font-size: 1em; } +blockquote cite:before, .uncited:before { + padding-right: 5px; +} + blockquote cite > div { float: right; font-weight: normal; diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index 4fcb0dc76c..f5fe5558a4 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -9,7 +9,7 @@ * Just change the name of the font after the 14/1 to the name of * the font you wish to use. */ -.icon, .button .icon { +.icon, .button .icon, blockquote cite:before, .uncited:before { display: inline-block; font-weight: normal; font-style: normal; @@ -88,23 +88,10 @@ blockquote cite:before, .uncited:before { - -webkit-font-smoothing: antialiased; - -mos-osx-font-smoothing: grayscale; - font-family: FontAwesome; - font-size: 14px; - font-weight: normal; - font-style: normal; - font-variant: normal; - line-height: 1; - text-rendering: auto; - display: inline-block; - padding-right: 5px; content: '\f10d'; /* Font Awesome quote-left */ } .rtl blockquote cite:before, .rtl .uncited:before { - padding-right: 0; - padding-left: 5px; content: '\f10e'; /* Font Awesome quote-right */ } From f62419e15815ac7ccc98343c4e79934e9536d838 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 24 Mar 2017 05:39:30 -0600 Subject: [PATCH 8/8] [ticket/15086] Remove properties that are no longer used PHPBB3-15086 --- phpBB/styles/prosilver/theme/bidi.css | 1 - phpBB/styles/prosilver/theme/content.css | 1 - 2 files changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 5b0cdb8cdd..d19d2d84e0 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -492,7 +492,6 @@ li.breadcrumbs span:first-child > a { /* Quote block */ .rtl blockquote { margin: 0.5em 25px 0 1px; - background-position: 99% 8px; } .rtl blockquote blockquote { diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 72d8e8bd3b..7ff6b4d5ef 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -448,7 +448,6 @@ ul.searchresults { ----------------------------------------*/ /* Quote block */ blockquote { - background: transparent none 6px 8px no-repeat; border: 1px solid transparent; font-size: 0.95em; margin: 1em 1px 1em 25px;