diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java index 30e58deb..91b2acf7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java @@ -332,8 +332,7 @@ public class UserAgent implements Serializable { // Is it a supported browser ?. final UserAgent.Product product = this.getProduct(); boolean result = product == UserAgent.Product.FIREFOX && ((this.isVersionGreatedOrEqualThan(1, 5) && this.getOs() != UserAgent.OS.MAC) || (this.isVersionGreatedOrEqualThan(3, 0) && this.getOs() == UserAgent.OS.MAC)); - - result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(6, 0) && this.getOs() == UserAgent.OS.WINDOWS; + result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(7, 0) && this.getOs() == UserAgent.OS.WINDOWS; result = result || product == UserAgent.Product.OPERA && this.isVersionGreatedOrEqualThan(9, 2); result = result || product == UserAgent.Product.CHROME && this.isVersionGreatedOrEqualThan(7, 0); result = result || product == UserAgent.Product.SAFARI && this.isVersionGreatedOrEqualThan(3, 0); diff --git a/wise-webapp/src/main/webapp/css/bubble.css b/wise-webapp/src/main/webapp/css/bubble.css index a43a988d..ecdf537c 100644 --- a/wise-webapp/src/main/webapp/css/bubble.css +++ b/wise-webapp/src/main/webapp/css/bubble.css @@ -218,14 +218,12 @@ background: transparent url(../images/bubbleTip_bottom_pico_blue.png) top left; width: 58px; height: 62px; - behavior: url(../css/iepngfix.htc); } .bubbleTopHintBlue { background: transparent url(../images/bubbleTip_top_pico_blue.png) top left; width: 58px; height: 61px; - behavior: url(../css/iepngfix.htc); } .btn-primary { diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index f3f3b663..b4c83e1d 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -188,9 +188,7 @@ h4 { margin-top: 8px; height: 80px; width: 134px; - background-image: url("../images/logo-small.png"); - behavior: url(../css/iepngfix.htc); - background-repeat: no-repeat; + background: url("../images/logo-small.png") no-repeat; position: absolute; top: 0; left: 0; @@ -349,7 +347,6 @@ div#printLogo { float: right; margin: 1px; background: url(../images/logo-vsmall.png) no-repeat right top; - behavior: url(../css/iepngfix.htc); } .btn-primary { diff --git a/wise-webapp/src/main/webapp/css/editor.css b/wise-webapp/src/main/webapp/css/editor.css index ffab7bbd..84a8555f 100644 --- a/wise-webapp/src/main/webapp/css/editor.css +++ b/wise-webapp/src/main/webapp/css/editor.css @@ -226,37 +226,30 @@ div#share { div#saveButton { background: url(../images/save.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#discardButton { background: url(../images/close.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#history { background: url(../images/history.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#print { background: url(../images/file_printer.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#undoEdition { background: url(../images/file_undo_dis.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#redoEdition { background: url(../images/file_redo_dis.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #export { background: url(../images/file_export.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); position:relative; } @@ -270,91 +263,75 @@ div#redoEdition { div#zoomIn { background: url(../images/zoom_in.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #zoomOut { background: url(../images/zoom_out.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #addTopic { background: url(../images/topic_add.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #deleteTopic { background: url(../images/topic_delete.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#topicColor { background: url(../images/topic_bgcolor.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicIcon { background: url(../images/topic_icon.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicNote { background: url(../images/note.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicLink { background: url(../images/topic_link.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#topicNote { background-image: url(../images/note.png); - behavior: url(../css/iepngfix.htc); z-index: 4; } #topicBorder { background: url(../images/topic_border.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); width: 30px; } #fontFamily { background: url(../images/font_type.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #topicShape { background: url(../images/topic_shape.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); width: 30px; } #fontBold { background: url(../images/font_bold.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #fontItalic { background: url(../images/font_italic.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } div#fontColor { background: url(../images/font_color.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } #fontSize { float: left; background: url(../images/font_size.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #font-size { @@ -372,18 +349,14 @@ div#fontColor { #shareIt { background: url(../images/collab_share.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #publishIt { background: url(../images/collab_publish.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); - } #tagIt { background: url(../images/collab_tag.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); } #colorPalette { @@ -486,7 +459,6 @@ div#actionsContainer { width: 6px; height: 25px; background: url(../images/btnStart2.png) no-repeat left top; - behavior: url(../css/iepngfix.htc); float: left; } @@ -494,8 +466,7 @@ div#actionsContainer { background: url(../images/btnBody2.png); float: left; height: 18px; - padding: 0px 5px; - padding-top: 5px; + padding: 5px 5px 0; text-align: center; color: black; } @@ -504,7 +475,6 @@ div#actionsContainer { width: 7px; height: 23px; background: url(../images/btnEnd2.png) no-repeat right top; - behavior: url(../css/iepngfix.htc); float: left; } @@ -524,7 +494,6 @@ div#footerEditor { float: right; margin: 5px; background: url(../images/logo-vsmall.png) no-repeat right top; - behavior: url(../css/iepngfix.htc); } #footerEditor .msgLoggerContainer { @@ -719,7 +688,7 @@ div#helpContainer { div#helpContent h1 { font-weight: bold; - color: whitesmoke; + color: #f5f5f5; font-size: 15px; } @@ -755,14 +724,12 @@ div#small_error_icon { div#toolbar .topicRelation { width:56px; background: url(../images/topic_relationship.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } div#toolbar .topicRelation:hover { width:56px; background: url(../images/topic_relationship.png) no-repeat center top; - behavior: url(../css/iepngfix.htc); z-index: 4; } diff --git a/wise-webapp/src/main/webapp/css/embedded.css b/wise-webapp/src/main/webapp/css/embedded.css index b1e6b92b..76915fd0 100644 --- a/wise-webapp/src/main/webapp/css/embedded.css +++ b/wise-webapp/src/main/webapp/css/embedded.css @@ -63,7 +63,7 @@ div#embFooter { height: 35px; width: 100%; bottom: 0; - left: 0px; + left: 0; border-top: 1px solid black; background: #E5E5E5; } @@ -73,7 +73,6 @@ div#logo { width: 80px; position: absolute; background: url( ../images/logo-vvsmall.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); right: 10px; top: -10px; } @@ -96,14 +95,12 @@ div#logo { #zoomIn { background: url( ../images/zoom_in.png ) no-repeat left top;; - behavior: url( ../css/iepngfix.htc ); margin-top: 10px; margin-left: 10px; } #zoomOut { background: url( ../images/zoom_out.png ) no-repeat left top;; - behavior: url( ../css/iepngfix.htc ); margin-top: 10px } diff --git a/wise-webapp/src/main/webapp/css/iepngfix.htc b/wise-webapp/src/main/webapp/css/iepngfix.htc deleted file mode 100644 index 6d15f325..00000000 --- a/wise-webapp/src/main/webapp/css/iepngfix.htc +++ /dev/null @@ -1,68 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/thirdparty.css b/wise-webapp/src/main/webapp/css/thirdparty.css index 77171f92..55bf8488 100644 --- a/wise-webapp/src/main/webapp/css/thirdparty.css +++ b/wise-webapp/src/main/webapp/css/thirdparty.css @@ -291,7 +291,7 @@ div.windoo-wise a.windoo-maximize-disabled, div.windoo-wise a.windoo-maximize-di } div.windoo-wise a.windoo-minimize { - top: 0px; + top: 0; right: 56px; background-position: 0 0; } @@ -308,7 +308,7 @@ div.windoo-wise a.windoo-minimize-disabled, div.windoo-wise a.windoo-minimize-di div.windoo-wise a.windoo-restore { display: none; - top: 0px; + top: 0; right: 15px; background-position: -46px 0; } diff --git a/wise-webapp/src/main/webapp/css/wisehome.css b/wise-webapp/src/main/webapp/css/wisehome.css index 7ec59d77..c3e17636 100644 --- a/wise-webapp/src/main/webapp/css/wisehome.css +++ b/wise-webapp/src/main/webapp/css/wisehome.css @@ -152,7 +152,6 @@ background: url( ../images/search3.png ) no-repeat left; padding-left: 35px; padding-bottom: 10px; - behavior: url( ../css/iepngfix.htc ); } #searchTitle { @@ -189,7 +188,6 @@ width: 6px; height: 25px; background: url( ../images/btnStart.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -197,8 +195,7 @@ background: url( ../images/btnBody.png ); height: 18px; float: left; - padding: 0px 0px; - padding-top: 5px; + padding: 5px 0 0; text-align: center; color: black; } @@ -207,7 +204,6 @@ width: 7px; height: 25px; background: url( ../images/btnEnd.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -228,7 +224,6 @@ div#tryNow .tryBtnStart { width: 10px; height: 70px; background: url( ../images/tryItStartBtn2.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -247,7 +242,7 @@ div#tryNow .tryBtnEnd { } div#tryNow .tryBtnText { - padding: 0px 20px; + padding: 0 20px; position: relative; height: 70px; font-size: 20px; @@ -288,7 +283,6 @@ div#video .videoBtnStart { width: 10px; height: 51px; background: url( ../images/videoStart.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -379,7 +373,6 @@ div#signUpButton .signUpStartBtn { width: 5px; height: 25px; background: url( ../images/signUpStartBtn.png ) no-repeat left top; - behavior: url( ../css/iepngfix.htc ); float: left; } @@ -396,7 +389,6 @@ div#signUpButton .signUpEndBtn { width: 7px; height: 25px; background: url( ../images/signUpEndBtn.png ) no-repeat right top; - behavior: url( ../css/iepngfix.htc ); float: left; }