Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 01:48:21 +01:00
Code Issues Projects Releases Wiki Activity

Twenty Fifteen: correct list indentation inside blockquotes.

Browse Source 
Props iamtakashi, fixes #30543.


Built from https://develop.svn.wordpress.org/trunk@30689


git-svn-id: http://core.svn.wordpress.org/trunk@30679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ian Stewart 2014-12-01 19:31:24 +00:00
parent 9c047d48ab
commit 20d135f3b2
4 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-content/themes/twentyfifteen/css/ie.css
View File

@ -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;
}

24
wp-content/themes/twentyfifteen/rtl.css
View File

@ -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;
}
}

8
wp-content/themes/twentyfifteen/style.css
View File

@ -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;
}
}

2
wp-includes/version.php
View File

@ -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.