From 19dc4bb13a381d20f360bb59e2062132dc4a1248 Mon Sep 17 00:00:00 2001
From: Ella Iseulde Van Dorpe <*@iseulde.com>
Date: Sat, 25 Jul 2015 23:00:24 +0000
Subject: [PATCH] Revert [31849] and [33351]

Also set the max-width of images in themes to 100%, not in pixels.

See #33022 and #31250.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentyfifteen/css/editor-style.css | 20 ++-----------------
 .../twentyfourteen/css/editor-style.css       | 20 ++-----------------
 .../twentythirteen/css/editor-style.css       | 16 ---------------
 .../js/tinymce/skins/wordpress/wp-content.css |  1 -
 wp-includes/version.php                       |  2 +-
 5 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/css/editor-style.css b/wp-content/themes/twentyfifteen/css/editor-style.css
index ab1b75a573..33db931ff1 100644
--- a/wp-content/themes/twentyfifteen/css/editor-style.css
+++ b/wp-content/themes/twentyfifteen/css/editor-style.css
@@ -15,7 +15,6 @@ Description: Used to style the TinyMCE editor.
  * 6.0 - Galleries
  * 7.0 - Audio / Video
  * 8.0 - RTL
- * 9.0 - Media Queries
  */
 
 
@@ -297,7 +296,7 @@ table td,
 img {
 	border: 0;
 	height: auto;
-	max-width: 660px;
+	max-width: 100%;
 	vertical-align: middle;
 }
 
@@ -347,7 +346,7 @@ a {
 	color: #707070;
 	font-family: "Noto Sans", sans-serif;
 	margin: 0 0 28px 0;
-	max-width: 660px;
+	max-width: 100%;
 	padding: 0;
 	text-align: inherit;
 }
@@ -476,18 +475,3 @@ body.rtl {
 .rtl table caption {
 	text-align: right;
 }
-
-
-/**
- * 9.0 Media Queries
- */
-
-@media screen and (max-width: 740px) {
-	body, img, .wp-caption {
-		max-width: 100%;
-	}
-
-	img, .wp-caption {
-		width: auto !important;
-	}
-}
diff --git a/wp-content/themes/twentyfourteen/css/editor-style.css b/wp-content/themes/twentyfourteen/css/editor-style.css
index b4dd3253f2..6bd5ac0f41 100644
--- a/wp-content/themes/twentyfourteen/css/editor-style.css
+++ b/wp-content/themes/twentyfourteen/css/editor-style.css
@@ -17,7 +17,6 @@ Description: Used to style the TinyMCE editor.
  * 8.0 - Galleries
  * 9.0 - Audio/Video
  * 10.0 - RTL
- * 11.0 - Media Queries
  * ----------------------------------------------------------------------------
  */
 
@@ -380,7 +379,7 @@ blockquote.alignright p {
 
 img {
 	height: auto;
-	max-width: 474px;
+	max-width: 100%;
 	vertical-align: middle;
 }
 
@@ -389,7 +388,7 @@ img {
 	border: none;
 	color: #767676;
 	margin: 0 0 24px 0;
-	max-width: 474px;
+	max-width: 100%;
 	padding: 0;
 	text-align: left;
 }
@@ -720,18 +719,3 @@ html .mceContentBody.rtl {
 .rtl td {
 	text-align: right;
 }
-
-
-/**
- * 11.0 Media Queries
- */
-
-@media screen and (max-width: 494px) {
-	body, img, .wp-caption {
-		max-width: 100%;
-	}
-
-	img, .wp-caption {
-		width: auto !important;
-	}
-}
diff --git a/wp-content/themes/twentythirteen/css/editor-style.css b/wp-content/themes/twentythirteen/css/editor-style.css
index 2e6218449e..568418992b 100644
--- a/wp-content/themes/twentythirteen/css/editor-style.css
+++ b/wp-content/themes/twentythirteen/css/editor-style.css
@@ -18,7 +18,6 @@ Description: Used to style the TinyMCE editor.
  * 9.0 - Audio/Video
  * 10.0 - Post Formats
  * 11.0 - RTL
- * 12.0 - Media Queries
  * ----------------------------------------------------------------------------
  */
 
@@ -770,18 +769,3 @@ html .mceContentBody.rtl {
 	background: none;
 	content: none;
 }
-
-
-/**
- * 12.0 Media Queries
- */
-
-@media screen and (max-width: 604px) {
-	body, img, .wp-caption {
-		max-width: 100%;
-	}
-
-	img, .wp-caption {
-		width: auto !important;
-	}
-}
diff --git a/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index df4671465e..312be22938 100644
--- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -141,7 +141,6 @@ img[data-mce-selected]::selection {
 	-webkit-box-shadow: none;
 	box-shadow: none;
 	width: 96%;
-	min-width: 96%;
 	height: 16px;
 	display: block;
 	margin: 15px auto 0;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cab877047d..8cf2b74ae9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33417';
+$wp_version = '4.3-beta4-33418';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.