Skip to content

Commit 105a1dc

Browse files
author
Piotr Jasiun
committed
Merge branch 't/11066' into major
2 parents e37b814 + 1ae4eb6 commit 105a1dc

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CKEditor 4 Changelog
55

66
New Features:
77

8+
* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts uses CSS reset.
89
* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed block commands break on widget issue; added contentDomInvalidated event.
910
* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: added tooltip to the drag handler.
1011
* [#10895](http://dev.ckeditor.com/ticket/10895): Image2: added support for server file browsers.

plugins/widget/plugin.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,18 @@
5454
'opacity:1' +
5555
'}'+
5656
'img.cke_widget_drag_handler{' +
57-
'cursor:move' +
57+
'cursor:move;' +
58+
'width:' + DRAG_HANDLER_SIZE + 'px;' +
59+
'height:' + DRAG_HANDLER_SIZE + 'px;' +
60+
'display:block' +
5861
'}' +
5962
'.cke_widget_mask{' +
6063
'position:absolute;' +
6164
'top:0;' +
6265
'left:0;' +
6366
'width:100%;' +
64-
'height:100%' +
67+
'height:100%;' +
68+
'display:block' +
6569
'}'
6670
);
6771
},
@@ -2389,14 +2393,14 @@
23892393
container = new CKEDITOR.dom.element( 'span', editor.document );
23902394

23912395
container.setAttributes( {
2392-
'class': 'cke_widget_drag_handler_container',
2396+
'class': 'cke_reset cke_widget_drag_handler_container',
23932397
// Split background and background-image for IE8 which will break on rgba().
23942398
style: 'background:rgba(220,220,220,0.5);background-image:url(' + editor.plugins.widget.path + 'images/handle.png)'
23952399
} );
23962400

23972401
img.setAttributes( {
23982402
draggable: 'true',
2399-
'class': 'cke_widget_drag_handler',
2403+
'class': 'cke_reset cke_widget_drag_handler',
24002404
'data-cke-widget-drag-handler': '1',
24012405
src: transparentImageData,
24022406
width: DRAG_HANDLER_SIZE,
@@ -2436,7 +2440,7 @@
24362440
var img = new CKEDITOR.dom.element( 'img', widget.editor.document );
24372441
img.setAttributes( {
24382442
src: transparentImageData,
2439-
'class': 'cke_widget_mask'
2443+
'class': 'cke_reset cke_widget_mask'
24402444
} );
24412445
widget.wrapper.append( img );
24422446
widget.mask = img;

skins/kama/reset.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
3838
box-sizing: content-box;
3939
-moz-box-sizing: content-box;
4040
-webkit-box-sizing: content-box;
41+
position: static;
42+
-webkit-transition: none;
43+
-moz-transition: none;
44+
-ms-transition: none;
45+
transition: none;
4146
}
4247

4348
/* Reset for elements and their children. */
@@ -55,6 +60,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
5560
box-sizing: content-box;
5661
-moz-box-sizing: content-box;
5762
-webkit-box-sizing: content-box;
63+
position: static;
64+
-webkit-transition: none;
65+
-moz-transition: none;
66+
-ms-transition: none;
67+
transition: none;
5868

5969
/* These are rule inherited by all children elements. */
6070
border-collapse: collapse;

skins/moono/reset.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
3838
box-sizing: content-box;
3939
-moz-box-sizing: content-box;
4040
-webkit-box-sizing: content-box;
41+
position: static;
42+
-webkit-transition: none;
43+
-moz-transition: none;
44+
-ms-transition: none;
45+
transition: none;
4146
}
4247

4348
/* Reset for elements and their children. */
@@ -55,6 +60,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
5560
box-sizing: content-box;
5661
-moz-box-sizing: content-box;
5762
-webkit-box-sizing: content-box;
63+
position: static;
64+
-webkit-transition: none;
65+
-moz-transition: none;
66+
-ms-transition: none;
67+
transition: none;
5868

5969
/* These are rule inherited by all children elements. */
6070
border-collapse: collapse;

0 commit comments

Comments
 (0)