mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 12:28:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
ee95103ced
1 changed files with 3 additions and 5 deletions
|
@ -519,9 +519,7 @@ blockquote cite > div {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
word-wrap: normal;
|
word-wrap: normal;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
overflow-x: scroll;
|
|
||||||
margin: 1em 0 1.2em;
|
margin: 1em 0 1.2em;
|
||||||
padding: 3px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.codebox p {
|
.codebox p {
|
||||||
|
@ -530,7 +528,8 @@ blockquote cite > div {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
border-bottom: 1px solid transparent;
|
border-bottom: 1px solid transparent;
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 3px;
|
margin-bottom: 0;
|
||||||
|
padding: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
blockquote .codebox {
|
blockquote .codebox {
|
||||||
|
@ -544,8 +543,7 @@ blockquote .codebox {
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
height: auto;
|
height: auto;
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
margin: 2px 0;
|
padding: 5px 3px;
|
||||||
padding-top: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Attachments
|
/* Attachments
|
||||||
|
|
Loading…
Add table
Reference in a new issue