Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Twenty Elevent: Captioned image fix for editor 

Fixes #33153
Props: @iseulde

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


git-svn-id: http://core.svn.wordpress.org/trunk@36925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Tammie Lister 2016-03-10 21:13:26 +00:00
parent d8636e70d7
commit 74e13b1149
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-content/themes/twentyeleven/editor-style.css
View File

@ -3,21 +3,12 @@ Theme Name: Twenty Eleven
Description: Used to style the TinyMCE editor.
*/
html .mceContentBody {
max-width: 584px;
}
* {
color: inherit;
font: 15px "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: inherit;
font-weight: inherit;
line-height: 1.625;
}
body {
color: #333;
font: 15px "Helvetica Neue", Helvetica, Arial, "Nimbus Sans L", sans-serif;
font-weight: 300;
line-height: 1.625;
max-width: 584px;
}
/* Headings */
@ -237,10 +228,6 @@ td {
}
/* Images */
img[class*="wp-image-"] {
height: auto;
max-width: 97.5%;
}
img.size-full {
width: auto; /* Prevent stretching of full-size images in IE8 */
}
@ -254,10 +241,12 @@ p img,
.wp-caption {
margin-top: 0.4em;
}
img,
.editor-attachment {
img {
border: 1px solid #ddd;
padding: 6px;
height: auto;
max-width: 97.5%;
max-width: calc( 100% - 14px );
}
img.alignleft,
img.alignright,
@ -269,25 +258,25 @@ img.aligncenter {
border: none;
margin-bottom: 1.625em;
max-width: 96%;
padding: 9px;
max-width: calc( 100% - 22px );
padding: 9px 11px;
}
.wp-caption img {
display: block;
margin: 5px auto 0 !important;
margin: 0 -2px;
max-width: 98%;
max-width: calc( 100% - 10px );
border-color: #eee;
}
.wp-caption .wp-caption-text,
.wp-caption-dd {
.wp-caption .wp-caption-dd {
color: #666;
font-family: Georgia, serif !important;
font-family: Georgia, serif;
font-size: 12px;
margin: 0 0 0.6em 0 !important;
padding: 0 0 5px 40px;
margin-bottom: 0.6em;
padding: 10px 0 5px 40px;
position: relative;
text-align: left;
}
.wp-caption .wp-caption-text:before {
.wp-caption .wp-caption-dd:before {
color: #666;
content: '\2014';
font-size: 14px;
@ -298,9 +287,9 @@ img.aligncenter {
left: 10px;
top: 7px;
}
a:focus img[class*="wp-image-"],
a:hover img[class*="wp-image-"],
a:active img[class*="wp-image-"] {
a:focus img,
a:hover img,
a:active img {
background: #eee;
border-color: #bbb;
}
@ -309,4 +298,4 @@ a:active img[class*="wp-image-"] {
.wp-caption a:hover img {
background: #fff;
border-color: #ddd;
}
}

4
wp-content/themes/twentyeleven/style.css
View File

@ -910,12 +910,13 @@ p img,
background: #eee;
margin-bottom: 1.625em;
max-width: 96%;
max-width: calc( 100% - 18px );
padding: 9px;
}
.wp-caption img {
display: block;
margin: -2px 0 0 -2px;
max-width: 98%;
max-width: calc( 100% - 14px );
}
.wp-caption .wp-caption-text,
.gallery-caption {
@ -965,6 +966,7 @@ img[class*="wp-image-"],
border: 1px solid #ddd;
padding: 6px;
max-width: 97.5%;
max-width: calc( 100% - 14px );
}
.wp-caption img {
border-color: #eee;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-beta3-36956';
$wp_version = '4.5-beta3-36957';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.