Skip to content

Commit

Permalink
Merge branch 't/9815'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Dec 21, 2012
2 parents 2bd7ee2 + 9d1335a commit 9025c89
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
8 changes: 6 additions & 2 deletions core/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,12 @@ if ( !CKEDITOR.env ) {
env.cssClass += ' cke_browser_iequirks';
}

if ( env.gecko && version < 10900 )
env.cssClass += ' cke_browser_gecko18';
if ( env.gecko ) {
if ( version < 10900 )
env.cssClass += ' cke_browser_gecko18';
else if ( version <= 11000 )
env.cssClass += ' cke_browser_gecko19';
}

if ( env.air )
env.cssClass += ' cke_browser_air';
Expand Down
9 changes: 7 additions & 2 deletions skins/moono/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,14 @@ Comments in this file will give more details about each of the above blocks.
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .15);
box-shadow: 0 0 3px rgba(0, 0, 0, .15);
}

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

Expand Down
8 changes: 0 additions & 8 deletions skins/moono/dialog_ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ This file contains styles to used by Internet Explorer 7 only.
/* Base it on dialog_ie.css, overriding it with styles defined in this file. */
@import url("dialog_ie.css");

.cke_dialog_body
{
/* By default, a relative position is used.
However it breaks IE7 and causes input flickering
when hovering dialog footer. Reset to static to fix it. */
position: static;
}

.cke_dialog_title
{
/* gradient fix */
Expand Down

0 comments on commit 9025c89

Please sign in to comment.