diff --git a/wp-content/themes/twentyfifteen/css/ie.css b/wp-content/themes/twentyfifteen/css/ie.css index 56dcd25689..36973b6ddc 100644 --- a/wp-content/themes/twentyfifteen/css/ie.css +++ b/wp-content/themes/twentyfifteen/css/ie.css @@ -35,7 +35,9 @@ ol { } li > ul, -li > ol { +li > ol, +blockquote > ul, +blockquote > ol { margin-left: 1.3333em; } @@ -670,7 +672,9 @@ img.aligncenter { } .comment-content li > ul, -.comment-content li > ol { +.comment-content li > ol, +.comment-content blockquote > ul, +.comment-content blockquote > ol { margin-left: 1.3333em; } @@ -771,7 +775,9 @@ video { } .rtl li > ul, -.rtl li > ol { +.rtl li > ol, +.rtl blockquote > ul, +.rtl blockquote > ol { margin-right: 1.3333em; margin-left: auto; } @@ -887,7 +893,9 @@ video { } .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-left: auto; } diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css index 4c22276fb7..5453c693fd 100644 --- a/wp-content/themes/twentyfifteen/rtl.css +++ b/wp-content/themes/twentyfifteen/rtl.css @@ -70,12 +70,6 @@ ol { margin: 0 1.3333em 1.6em 0; } -li > ul, -li > ol { - margin-right: 1.3333em; - margin-left: auto; -} - caption, th, td { @@ -369,6 +363,14 @@ img.alignleft { margin-left: auto; } + li > ul, + li > ol, + blockquote > ul, + blockquote > ol { + margin-right: 1.3333em; + margin-left: auto; + } + blockquote { margin-right: -1em; margin-left: auto; @@ -393,10 +395,18 @@ img.alignleft { } .comment-content ul, - .comment-content ol { + .comment-content ol { margin-right: 0; 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; + } } diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css index 022d58a265..e3f06f728e 100644 --- a/wp-content/themes/twentyfifteen/style.css +++ b/wp-content/themes/twentyfifteen/style.css @@ -2618,7 +2618,9 @@ span > video { } li > ul, - li > ol { + li > ol, + blockquote > ul, + blockquote > ol { margin-left: 1.3333em; } @@ -2785,7 +2787,9 @@ span > video { } .comment-content li > ul, - .comment-content li > ol { + .comment-content li > ol, + .comment-content blockquote > ul, + .comment-content blockquote > ol { margin-left: 1.3333em; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 37fdcee909..f35cbba504 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30688'; +$wp_version = '4.1-beta2-30689'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.