Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-24 13:54:59 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE: Fix styling of selected state for linked images containing captions.

Browse Source 
Merges [41141] onto 4.8 branch.
Props azaozz.
Fixes #41408 for 4.8.1.

Built from https://develop.svn.wordpress.org/branches/4.8@41142


git-svn-id: http://core.svn.wordpress.org/branches/4.8@40982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-07-25 02:21:34 +00:00
parent 7cdc8af10c
commit 7eccdc89e7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/js/tinymce/skins/wordpress/wp-content.css
View File

@ -101,8 +101,9 @@ img {
width: auto !important;
}
.wp-caption img {
display: block;
dl.wp-caption dt.wp-caption-dt img {
display: inline-block;
margin-bottom: -1ex;
}
div.mceTemp {
@ -180,6 +181,14 @@ img[data-mce-selected]::selection {
background: #bfe6ff;
}
.mce-content-body .wp-caption-dt a[data-mce-selected] {
outline: none;
padding: 0;
margin: 0;
box-shadow: none;
background: transparent;
}
.mce-content-body code {
padding: 2px 4px;
margin: 0;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8.1-beta1-41140';
$wp_version = '4.8.1-beta1-41142';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.