Skip to content

Commit 9025c89

Browse files
committed
Merge branch 't/9815'
2 parents 2bd7ee2 + 9d1335a commit 9025c89

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

core/env.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,12 @@ if ( !CKEDITOR.env ) {
296296
env.cssClass += ' cke_browser_iequirks';
297297
}
298298

299-
if ( env.gecko && version < 10900 )
300-
env.cssClass += ' cke_browser_gecko18';
299+
if ( env.gecko ) {
300+
if ( version < 10900 )
301+
env.cssClass += ' cke_browser_gecko18';
302+
else if ( version <= 11000 )
303+
env.cssClass += ' cke_browser_gecko19';
304+
}
301305

302306
if ( env.air )
303307
env.cssClass += ' cke_browser_air';

skins/moono/dialog.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,14 @@ Comments in this file will give more details about each of the above blocks.
6262
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
6363
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
6464
box-shadow: 0 0 3px rgba(0, 0, 0, .15);
65+
}
6566

66-
/* This one is required by Firefox 3.6. Without it,
67-
dialog tabs and resizer float outside of the dialog. */
67+
/* This one is required by Firefox 3.6. Without it,
68+
dialog tabs and resizer float outside of the dialog.
69+
Although this rule doesn't seem to break anything on other
70+
browsers, it doesn't work with broken jQueryUI - #9851. */
71+
.cke_browser_gecko19 .cke_dialog_body
72+
{
6873
position: relative;
6974
}
7075

skins/moono/dialog_ie7.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ This file contains styles to used by Internet Explorer 7 only.
1313
/* Base it on dialog_ie.css, overriding it with styles defined in this file. */
1414
@import url("dialog_ie.css");
1515

16-
.cke_dialog_body
17-
{
18-
/* By default, a relative position is used.
19-
However it breaks IE7 and causes input flickering
20-
when hovering dialog footer. Reset to static to fix it. */
21-
position: static;
22-
}
23-
2416
.cke_dialog_title
2517
{
2618
/* gradient fix */

0 commit comments

Comments
 (0)