Twenty Fifteen: correct list indentation inside blockquotes.

Props iamtakashi, fixes #30543.



git-svn-id: https://develop.svn.wordpress.org/trunk@30689 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ian Stewart 2014-12-01 19:30:56 +00:00
parent 50386cafd5
commit 4598e80675
3 changed files with 35 additions and 13 deletions

View File

@ -35,7 +35,9 @@ ol {
} }
li > ul, li > ul,
li > ol { li > ol,
blockquote > ul,
blockquote > ol {
margin-left: 1.3333em; margin-left: 1.3333em;
} }
@ -670,7 +672,9 @@ img.aligncenter {
} }
.comment-content li > ul, .comment-content li > ul,
.comment-content li > ol { .comment-content li > ol,
.comment-content blockquote > ul,
.comment-content blockquote > ol {
margin-left: 1.3333em; margin-left: 1.3333em;
} }
@ -771,7 +775,9 @@ video {
} }
.rtl li > ul, .rtl li > ul,
.rtl li > ol { .rtl li > ol,
.rtl blockquote > ul,
.rtl blockquote > ol {
margin-right: 1.3333em; margin-right: 1.3333em;
margin-left: auto; margin-left: auto;
} }
@ -887,7 +893,9 @@ video {
} }
.rtl .comment-content li > ul, .rtl .comment-content li > ul,
.rtl .comment-content li > ol { .rtl .comment-content li > ol,
.rtl .comment-content blockquote > ul,
.rtl .comment-content blockquote > ol {
margin-right: 1.3333em; margin-right: 1.3333em;
margin-left: auto; margin-left: auto;
} }

View File

@ -70,12 +70,6 @@ ol {
margin: 0 1.3333em 1.6em 0; margin: 0 1.3333em 1.6em 0;
} }
li > ul,
li > ol {
margin-right: 1.3333em;
margin-left: auto;
}
caption, caption,
th, th,
td { td {
@ -369,6 +363,14 @@ img.alignleft {
margin-left: auto; margin-left: auto;
} }
li > ul,
li > ol,
blockquote > ul,
blockquote > ol {
margin-right: 1.3333em;
margin-left: auto;
}
blockquote { blockquote {
margin-right: -1em; margin-right: -1em;
margin-left: auto; margin-left: auto;
@ -393,10 +395,18 @@ img.alignleft {
} }
.comment-content ul, .comment-content ul,
.comment-content ol { .comment-content ol {
margin-right: 0; margin-right: 0;
margin-left: auto; margin-left: auto;
} }
.comment-content li > ul,
.comment-content li > ol,
.comment-content blockquote > ul,
.comment-content blockquote > ol {
margin-right: 1.3333em;
margin-left: auto;
}
} }

View File

@ -2618,7 +2618,9 @@ span > video {
} }
li > ul, li > ul,
li > ol { li > ol,
blockquote > ul,
blockquote > ol {
margin-left: 1.3333em; margin-left: 1.3333em;
} }
@ -2785,7 +2787,9 @@ span > video {
} }
.comment-content li > ul, .comment-content li > ul,
.comment-content li > ol { .comment-content li > ol,
.comment-content blockquote > ul,
.comment-content blockquote > ol {
margin-left: 1.3333em; margin-left: 1.3333em;
} }
} }