From 0e4d52f9d29d33bd12033fc5d6eae4e7dcab0795 Mon Sep 17 00:00:00 2001 From: Volker E Date: Thu, 19 Mar 2015 09:10:58 +0100 Subject: [PATCH] fixing #15027, cleaning up obsolete IE5-7 workaround code --- core/css/apps.css | 1 - core/css/header.css | 25 ++++++++++++++----------- core/css/jquery-ui-fixes.css | 2 -- core/css/jquery.ocdialog.css | 2 +- core/css/mobile.css | 4 ---- core/css/styles.css | 20 +++++--------------- core/templates/exception.php | 2 +- core/templates/installation.php | 2 +- core/templates/layout.user.php | 8 ++++---- 9 files changed, 26 insertions(+), 40 deletions(-) diff --git a/core/css/apps.css b/core/css/apps.css index a460bcf46c..20822f8b39 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -524,6 +524,5 @@ button.loading { em { font-style: normal; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } diff --git a/core/css/header.css b/core/css/header.css index b4e074a5e4..f249be8c4b 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -95,7 +95,6 @@ .menutoggle .header-appname, .menutoggle .icon-caret { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)"; - filter: alpha(opacity=75); opacity: .75; } .menutoggle:hover .header-appname, @@ -105,7 +104,6 @@ .menutoggle.active .header-appname, .menutoggle.active .icon-caret { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } @@ -186,7 +184,6 @@ #navigation a span { /* 50% opacity when inactive */ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } #navigation a:hover img, #navigation a:focus img, @@ -195,7 +192,6 @@ #navigation a.active span { /* full opacity for the active app or when hovered/focused */ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } @@ -209,7 +205,6 @@ /* Apps management */ #apps-management { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; - filter: alpha(opacity=60); opacity: .6; min-height: initial; height: initial; @@ -228,7 +223,6 @@ } #navigation .app-loading .app-icon { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)"; - filter: alpha(opacity=10); opacity: .1; } @@ -278,8 +272,17 @@ cursor: pointer; } #expand:hover, #expand:focus, #expand:active { color:#fff; } -#expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; } -#expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } +#expand img { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + opacity: .7; + margin-bottom: -2px; +} +#expand:hover img, +#expand:focus img, +#expand:active img { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity:1; +} #expanddiv { position: absolute; right: 0; @@ -297,7 +300,6 @@ color: #fff; padding: 4px 12px 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - filter: alpha(opacity=70); opacity: .7; -moz-box-sizing: border-box; box-sizing: border-box; @@ -306,8 +308,9 @@ margin-bottom: -3px; margin-right: 6px; } - #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { + #expanddiv a:hover, + #expanddiv a:focus, + #expanddiv a:active { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } diff --git a/core/css/jquery-ui-fixes.css b/core/css/jquery-ui-fixes.css index 0bfa947989..7e0cdd1820 100644 --- a/core/css/jquery-ui-fixes.css +++ b/core/css/jquery-ui-fixes.css @@ -128,13 +128,11 @@ .ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .5; - filter: Alpha(Opacity=50); } .ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .2; - filter: Alpha(Opacity=20); border-radius: 5px; } diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css index 93930bf435..bada0b73a5 100644 --- a/core/css/jquery.ocdialog.css +++ b/core/css/jquery.ocdialog.css @@ -52,7 +52,7 @@ .oc-dialog-dim { background-color: #000; - opacity: .20;filter:Alpha(Opacity=20); + opacity: .20; z-index: 999; position: fixed; top: 0; left: 0; diff --git a/core/css/mobile.css b/core/css/mobile.css index a98547596b..662c583efb 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -109,14 +109,10 @@ z-index: 149; background-color: rgba(255, 255, 255, .7); cursor: pointer; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; - filter: alpha(opacity=60); opacity: .6; } #app-navigation-toggle:hover, #app-navigation-toggle:focus { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } diff --git a/core/css/styles.css b/core/css/styles.css index 74df29140a..08562e8772 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -133,7 +133,8 @@ input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active, input[type="time"]:hover, input[type="time"]:focus, input[type="time"]:active, textarea:hover, textarea:focus, textarea:active { color: #333; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + opacity: 1; } input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } @@ -243,7 +244,8 @@ textarea:disabled { background: #fff url('../img/actions/search.svg') no-repeat .5em center; border: 0; border-radius: 2em; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity: .7; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + opacity: .7; margin-top: 6px; float: right; } @@ -343,7 +345,6 @@ input[type="submit"].enabled { width: 64px; margin: 0 auto 15px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } @@ -368,7 +369,6 @@ input[type="submit"].enabled { text-align: center; color: #ccc; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; - filter: alpha(opacity=60); opacity: .6; } /* overrides another !important statement that sets this to unreadable black */ @@ -468,7 +468,6 @@ input[name='password-clone'] { left: 16px; top: 22px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - filter: alpha(opacity=30); opacity: .3; } #adminpass-icon, #password-icon { @@ -572,7 +571,6 @@ label.infield { } #show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; - filter: alpha(opacity=80); opacity: .8; } #show + label, #dbpassword + label, #personal-show + label { @@ -583,7 +581,6 @@ label.infield { background-repeat: no-repeat; background-position: center; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - filter: alpha(opacity=30); opacity: .3; } #pass2, input[name="personal-password-clone"] { @@ -675,7 +672,6 @@ label.infield { } #body-login .warning legend { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } #body-login a.warning { @@ -763,8 +759,7 @@ label.infield { top: 0; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; - filter:alpha(opacity=90); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; opacity: .9; } #notification span, #update-notification span { @@ -775,7 +770,6 @@ label.infield { tr .action:not(.permanent), .selectedActions a { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); opacity: 0; } tr:hover .action, @@ -783,7 +777,6 @@ tr:focus .action, tr .action.permanent, .selectedActions a { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } tr .action { @@ -792,7 +785,6 @@ tr .action { } .header-action { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; - filter: alpha(opacity=80); opacity: .8; } tr:hover .action:hover, @@ -802,7 +794,6 @@ tr:focus .action:focus, .header-action:hover, .header-action:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } tbody tr:hover, @@ -981,7 +972,6 @@ div.crumb:focus, div.crumb a:focus, div.crumb:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - filter:alpha(opacity=70); opacity:.7; } diff --git a/core/templates/exception.php b/core/templates/exception.php index e5b57e2645..0f0924b0f8 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -9,7 +9,7 @@ style('core', ['styles', 'header']);

t('The server encountered an internal error and was unable to complete your request.')) ?>

t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?>

t('More details can be found in the server log.')) ?>

-
+

t('Technical details')) ?>