1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-03 23:43:10 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-04-27 09:36:14 -04:00
commit bd1206d45f
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 17 additions and 12 deletions

View File

@ -535,7 +535,6 @@ li.breadcrumbs span:first-child > a {
/* Quote block */
.rtl blockquote {
background-position: 99% 8px;
margin: 0.5em 25px 0 1px;
}
@ -546,10 +545,13 @@ li.breadcrumbs span:first-child > a {
.rtl blockquote cite {
/* Username/source of quoter */
margin-right: 20px;
margin-left: 0;
}
.rtl blockquote cite:before, .rtl .uncited:before {
padding-left: 5px;
}
.rtl blockquote .codebox {
margin-right: 0;
}

View File

@ -416,14 +416,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;

View File

@ -474,7 +474,6 @@ ul.searchresults {
/* Quote block */
blockquote {
font-size: 0.95em;
background: transparent none 6px 8px no-repeat;
border: 1px solid transparent;
overflow: hidden;
margin: 1em 1px 1em 25px;
@ -494,15 +493,14 @@ blockquote cite {
/* Username/source of quoter */
font-style: normal;
display: block;
margin-left: 20px;
}
blockquote cite cite {
font-size: 1em;
}
blockquote.uncited {
padding-top: 25px;
blockquote cite:before, .uncited:before {
padding-right: 5px;
}
blockquote cite > div {

View File

@ -10,7 +10,8 @@
* the font you wish to use.
*/
.icon,
.button .icon {
.button .icon,
blockquote cite:before, .uncited:before {
font-family: FontAwesome;
font-size: 14px;
font-weight: normal;
@ -91,3 +92,12 @@
height: 12px;
padding: 0;
}
blockquote cite:before, .uncited:before {
content: '\f10d'; /* Font Awesome quote-left */
}
.rtl blockquote cite:before, .rtl .uncited:before {
content: '\f10e'; /* Font Awesome quote-right */
}