Merge pull request #4822 from Louis7777/ticket/15212

[ticket/15212] Fix code box double horizontal scrollbars
This commit is contained in:
Marc Alexander 2017-05-21 16:38:21 +02:00
commit 37e30ad83e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -489,18 +489,17 @@ blockquote cite > div {
/* Code block */ /* Code block */
.codebox { .codebox {
padding: 3px;
border: 1px solid transparent; border: 1px solid transparent;
font-size: 1em; font-size: 1em;
margin: 1em 0 1.2em 0; margin: 1em 0 1.2em 0;
overflow-x: scroll;
word-wrap: normal; word-wrap: normal;
} }
.codebox p { .codebox p {
text-transform: uppercase; text-transform: uppercase;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
margin-bottom: 3px; margin-bottom: 0;
padding: 3px;
font-size: 0.8em !important; font-size: 0.8em !important;
font-weight: bold; font-weight: bold;
display: block; display: block;
@ -515,10 +514,9 @@ blockquote .codebox {
display: block; display: block;
height: auto; height: auto;
max-height: 200px; max-height: 200px;
padding-top: 5px; padding: 5px 3px;
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace;
line-height: 1.3em; line-height: 1.3em;
margin: 2px 0;
} }
/* Attachments /* Attachments