Skip to content
Permalink
Browse files

Merge branch 't/9815'

  • Loading branch information...
Reinmar committed Dec 21, 2012
2 parents 2bd7ee2 + 9d1335a commit 9025c89529ac4c5e815b87e84095a0228c122cd5
Showing with 13 additions and 12 deletions.
  1. +6 −2 core/env.js
  2. +7 −2 skins/moono/dialog.css
  3. +0 −8 skins/moono/dialog_ie7.css
@@ -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';
@@ -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;
}

@@ -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 */

0 comments on commit 9025c89

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