Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/9366'
  • Loading branch information
Reinmar committed Dec 10, 2012
2 parents 90962b0 + 5db257d commit 1547c39
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions plugins/contextmenu/plugin.js
Expand Up @@ -18,9 +18,7 @@ CKEDITOR.plugins.add( 'contextmenu', {
className: 'cke_menu_panel',
attributes: {
'aria-label': editor.lang.contextmenu.options
},
// Hide under toolbar (-1).
zIndexOffset: -2
}
}
});
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/panel/plugin.js
Expand Up @@ -159,7 +159,7 @@
cls: this.className,
frame: '',
env: CKEDITOR.env.cssClass,
'z-index': editor.config.baseFloatZIndex + ( this.zIndexOffset || 1 )
'z-index': editor.config.baseFloatZIndex + 1
};

if ( this.isFramed ) {
Expand Down

0 comments on commit 1547c39

Please sign in to comment.