From b345915d0f11b28aa32a409b0bfee23852082284 Mon Sep 17 00:00:00 2001 From: Rob Moen Date: Fri, 6 Jul 2012 14:50:19 -0700 Subject: [PATCH] Fix link inspector css in new version of chrome. Chrome engine modifies CSS names to lowercase when inside iframe... Change-Id: I9cd8ccba011d82549ad71acd2b18c6241ec47ca4 --- modules/ve/ui/inspectors/ve.ui.LinkInspector.js | 2 +- modules/ve/ui/styles/ve.ui.Inspector.css | 7 ++++--- modules/ve/ui/ve.ui.Context.js | 1 + modules/ve/ui/ve.ui.Inspector.js | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/ve/ui/inspectors/ve.ui.LinkInspector.js b/modules/ve/ui/inspectors/ve.ui.LinkInspector.js index c1e9f499a3..39db1615c0 100644 --- a/modules/ve/ui/inspectors/ve.ui.LinkInspector.js +++ b/modules/ve/ui/inspectors/ve.ui.LinkInspector.js @@ -9,7 +9,7 @@ ve.ui.LinkInspector = function( toolbar, context ) { // Inheritance ve.ui.Inspector.call( this, toolbar, context ); // Properties - this.$clearButton = $( '
' ) + this.$clearButton = $( '
' ) .prependTo( this.$ ); this.$.prepend( $( '
' ) diff --git a/modules/ve/ui/styles/ve.ui.Inspector.css b/modules/ve/ui/styles/ve.ui.Inspector.css index ca05a9b27d..a2f6de4b84 100644 --- a/modules/ve/ui/styles/ve.ui.Inspector.css +++ b/modules/ve/ui/styles/ve.ui.Inspector.css @@ -41,17 +41,18 @@ filter:alpha(opacity=25); opacity: 0.25; } -.es-inspector-closeButton { + +.es-inspector-close-button { right: 0.25em; background-image: url(images/close.png); } -.es-inspector-acceptButton { +.es-inspector-accept-button { right: 2.25em; background-image: url(images/accept.png); } -.es-inspector-clearButton { +.es-inspector-clear-button { right: 4.25em; background-image: url(images/clear.png); } diff --git a/modules/ve/ui/ve.ui.Context.js b/modules/ve/ui/ve.ui.Context.js index 7a9cc8d43f..379b588c43 100644 --- a/modules/ve/ui/ve.ui.Context.js +++ b/modules/ve/ui/ve.ui.Context.js @@ -213,6 +213,7 @@ ve.ui.Context.prototype.addInspector = function( name, inspector ) { .attr({ 'rel': 'stylesheet', 'type': 'text/css', + 'media': 'screen', 'href': ve.ui.getStylesheetPath() + 've.ui.Inspector.css' }); diff --git a/modules/ve/ui/ve.ui.Inspector.js b/modules/ve/ui/ve.ui.Inspector.js index 18fd0f4e8f..260bd34539 100644 --- a/modules/ve/ui/ve.ui.Inspector.js +++ b/modules/ve/ui/ve.ui.Inspector.js @@ -18,9 +18,9 @@ ve.ui.Inspector = function( toolbar, context ) { this.context = context; this.$ = $( '
' ); // - this.$closeButton = $( '
' ) + this.$closeButton = $( '
' ) .appendTo( this.$ ); - this.$acceptButton = $( '
' ) + this.$acceptButton = $( '
' ) .appendTo( this.$ ); this.$form = $( '
' ).appendTo( this.$ );