Merge branch 't/11204'

Reinmar · Reinmar · commit 0fab04efef0b · 2013-11-25T14:42:34.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,6 +13,7 @@ Fixed Issues:
 * [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when inline widget is in a heading.
 * [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of inline widget.
 * [#11182](http://dev.ckeditor.com/ticket/11182): [Internet Explorer 10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
+* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to `contents.css` so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
 
 ## CKEditor 4.3
 
diff --git a/contents.css b/contents.css
@@ -104,3 +104,20 @@ span[lang]
 {
    font-style: italic;
 }
+
+figure
+{
+	text-align: center;
+	border: solid 1px #ccc;
+	border-radius: 2px;
+	background: rgba(0,0,0,0.05);
+	padding: 10px;
+	margin: 10px 20px;
+	display: block; /* For IE8 */
+}
+
+figure figcaption
+{
+	text-align: center;
+	display: block; /* For IE8 */
+}
diff --git a/plugins/image2/dev/contents.css b/plugins/image2/dev/contents.css
@@ -3,23 +3,8 @@ Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 
-figure.caption {
-	text-align: center;
-	border: solid 1px #ccc;
-	border-radius: 2px;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: block; /* For IE8 */
-}
-
-figure.caption figcaption {
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
 .cke_widget_wrapper:hover:after {
-	content: "id: " attr(data-widget-id);
+	content: "id: " attr(data-cke-widget-id);
 	position: absolute;
 	top: 0;
 	right: 0;
diff --git a/plugins/image2/dev/image2.html b/plugins/image2/dev/image2.html
@@ -74,6 +74,7 @@
 
 	</style>
 	<link href="contents.css" rel="stylesheet">
+	<link href="../../../contents.css" rel="stylesheet">
 </head>
 <body>
 	<h1 class="samples">
diff --git a/plugins/image2/samples/contents.css b/plugins/image2/samples/contents.css
diff --git a/plugins/image2/samples/image2.html b/plugins/image2/samples/image2.html
@@ -50,8 +50,7 @@ <h1 class="samples">
 		CKEDITOR.replace( 'editor1', {
 			extraPlugins: 'image2',
 			height: 450,
-			removePlugins: 'image',
-			contentsCss: [ '../../../contents.css', 'contents.css' ]
+			removePlugins: 'image'
 		} );
 
 	</script>
