From 7eccdc89e7c877d650fe188da15983a5a7d9fd13 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 25 Jul 2017 02:21:34 +0000
Subject: [PATCH] TinyMCE: Fix styling of selected state for linked images
 containing captions.

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
---
 .../js/tinymce/skins/wordpress/wp-content.css       | 13 +++++++++++--
 wp-includes/version.php                             |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index a09829bf38..0e411895f2 100644
--- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -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;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 051ecd9559..78222ba11e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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.