Skip to content
Permalink
Browse files

Merge branch 't/12777'

  • Loading branch information...
Reinmar committed Dec 23, 2014
2 parents b17f5e0 + 3d35ba9 commit 209e2cffadd56f0a372c901fc52b7edba723e3ed
Showing with 74 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +8 −2 skins/kama/reset.css
  3. +7 −1 skins/moono/reset.css
  4. +18 −0 tests/tickets/12777/1.html
  5. +10 −0 tests/tickets/12777/1.md
  6. +20 −0 tests/tickets/12777/2.html
  7. +10 −0 tests/tickets/12777/2.md
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#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)!
* [#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.
* [#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.
* [#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.
@@ -112,8 +112,14 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
border: 2px groove #E0DFE3;
}

.cke_reset_all select {
.cke_reset_all select
{
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
}

.cke_reset_all table
{
table-layout: auto;
}
@@ -113,8 +113,14 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
border: 2px groove #E0DFE3;
}

.cke_reset_all select {
.cke_reset_all select
{
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}

.cke_reset_all table
{
table-layout: auto;
}
@@ -0,0 +1,18 @@
<head>
<style>
table
{
table-layout: fixed;
}
</style>
</head>

<body>
<div id="editor">
<p>Foo</p>
</div>

<script>
CKEDITOR.replace( 'editor' );
</script>
</body>
@@ -0,0 +1,10 @@
@bender-tags: 4.4.7, tc
@bender-ui: collapsed
@bender-ckeditor-plugins: wysiwygarea, toolbar, image

1. Click the image button.

Expected: the dialog's layout is OK:

* the preview panel should be fully visible,
* the *lock* and *refresh* icons are close (<20px) to the inputs.
@@ -0,0 +1,20 @@
<head>
<style>
table
{
table-layout: fixed;
}
</style>
</head>

<body>
<div id="editor">
<p>Foo</p>
</div>

<script>
CKEDITOR.replace( 'editor', {
skin: 'kama'
} );
</script>
</body>
@@ -0,0 +1,10 @@
@bender-tags: 4.4.7, tc
@bender-ui: collapsed
@bender-ckeditor-plugins: wysiwygarea, toolbar, image

1. Click the image button.

Expected: the dialog's layout is OK:

* the preview panel should be fully visible,
* the *lock* and *refresh* icons are close (<20px) to the inputs.

0 comments on commit 209e2cf

Please sign in to comment.
You can’t perform that action at this time.