Skip to content

Commit 209e2cf

Browse files
committed
Merge branch 't/12777'
2 parents b17f5e0 + 3d35ba9 commit 209e2cf

File tree

7 files changed

+74
-3
lines changed

7 files changed

+74
-3
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
Fixed Issues:
77

8+
* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
89
* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when editor is maximized results in incorrect drop-down panel position.
910
* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`Config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
1011
* [#12750](http://dev.ckeditor.com/ticket/12750): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword): strikethrough and underscore should have the same color as font.

skins/kama/reset.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,14 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
112112
border: 2px groove #E0DFE3;
113113
}
114114

115-
.cke_reset_all select {
115+
.cke_reset_all select
116+
{
116117
box-sizing: border-box;
117118
-moz-box-sizing: border-box;
118119
-webkit-box-sizing: border-box;
119-
}
120+
}
121+
122+
.cke_reset_all table
123+
{
124+
table-layout: auto;
125+
}

skins/moono/reset.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,14 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
113113
border: 2px groove #E0DFE3;
114114
}
115115

116-
.cke_reset_all select {
116+
.cke_reset_all select
117+
{
117118
box-sizing: border-box;
118119
-moz-box-sizing: border-box;
119120
-webkit-box-sizing: border-box;
120121
}
122+
123+
.cke_reset_all table
124+
{
125+
table-layout: auto;
126+
}

tests/tickets/12777/1.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<head>
2+
<style>
3+
table
4+
{
5+
table-layout: fixed;
6+
}
7+
</style>
8+
</head>
9+
10+
<body>
11+
<div id="editor">
12+
<p>Foo</p>
13+
</div>
14+
15+
<script>
16+
CKEDITOR.replace( 'editor' );
17+
</script>
18+
</body>

tests/tickets/12777/1.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@bender-tags: 4.4.7, tc
2+
@bender-ui: collapsed
3+
@bender-ckeditor-plugins: wysiwygarea, toolbar, image
4+
5+
1. Click the image button.
6+
7+
Expected: the dialog's layout is OK:
8+
9+
* the preview panel should be fully visible,
10+
* the *lock* and *refresh* icons are close (<20px) to the inputs.

tests/tickets/12777/2.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<head>
2+
<style>
3+
table
4+
{
5+
table-layout: fixed;
6+
}
7+
</style>
8+
</head>
9+
10+
<body>
11+
<div id="editor">
12+
<p>Foo</p>
13+
</div>
14+
15+
<script>
16+
CKEDITOR.replace( 'editor', {
17+
skin: 'kama'
18+
} );
19+
</script>
20+
</body>

tests/tickets/12777/2.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@bender-tags: 4.4.7, tc
2+
@bender-ui: collapsed
3+
@bender-ckeditor-plugins: wysiwygarea, toolbar, image
4+
5+
1. Click the image button.
6+
7+
Expected: the dialog's layout is OK:
8+
9+
* the preview panel should be fully visible,
10+
* the *lock* and *refresh* icons are close (<20px) to the inputs.

0 commit comments

Comments
 (0)