fixing #15027, cleaning up obsolete IE5-7 workaround code

This commit is contained in:
Volker E 2015-03-19 09:10:58 +01:00
parent 0d0c73cf2b
commit 0e4d52f9d2
9 changed files with 26 additions and 40 deletions

View File

@ -524,6 +524,5 @@ button.loading {
em { em {
font-style: normal; font-style: normal;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }

View File

@ -95,7 +95,6 @@
.menutoggle .header-appname, .menutoggle .header-appname,
.menutoggle .icon-caret { .menutoggle .icon-caret {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
filter: alpha(opacity=75);
opacity: .75; opacity: .75;
} }
.menutoggle:hover .header-appname, .menutoggle:hover .header-appname,
@ -105,7 +104,6 @@
.menutoggle.active .header-appname, .menutoggle.active .header-appname,
.menutoggle.active .icon-caret { .menutoggle.active .icon-caret {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }
@ -186,7 +184,6 @@
#navigation a span { #navigation a span {
/* 50% opacity when inactive */ /* 50% opacity when inactive */
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
#navigation a:hover img, #navigation a:focus img, #navigation a:hover img, #navigation a:focus img,
@ -195,7 +192,6 @@
#navigation a.active span { #navigation a.active span {
/* full opacity for the active app or when hovered/focused */ /* full opacity for the active app or when hovered/focused */
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }
@ -209,7 +205,6 @@
/* Apps management */ /* Apps management */
#apps-management { #apps-management {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60);
opacity: .6; opacity: .6;
min-height: initial; min-height: initial;
height: initial; height: initial;
@ -228,7 +223,6 @@
} }
#navigation .app-loading .app-icon { #navigation .app-loading .app-icon {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)";
filter: alpha(opacity=10);
opacity: .1; opacity: .1;
} }
@ -278,8 +272,17 @@
cursor: pointer; cursor: pointer;
} }
#expand:hover, #expand:focus, #expand:active { color:#fff; } #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 img {
#expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } -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 { #expanddiv {
position: absolute; position: absolute;
right: 0; right: 0;
@ -297,7 +300,6 @@
color: #fff; color: #fff;
padding: 4px 12px 0; padding: 4px 12px 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: .7; opacity: .7;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
@ -306,8 +308,9 @@
margin-bottom: -3px; margin-bottom: -3px;
margin-right: 6px; 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)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }

View File

@ -128,13 +128,11 @@
.ui-widget-overlay { .ui-widget-overlay {
background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
opacity: .5; opacity: .5;
filter: Alpha(Opacity=50);
} }
.ui-widget-shadow { .ui-widget-shadow {
margin: -5px 0 0 -5px; margin: -5px 0 0 -5px;
padding: 5px; padding: 5px;
background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
opacity: .2; opacity: .2;
filter: Alpha(Opacity=20);
border-radius: 5px; border-radius: 5px;
} }

View File

@ -52,7 +52,7 @@
.oc-dialog-dim { .oc-dialog-dim {
background-color: #000; background-color: #000;
opacity: .20;filter:Alpha(Opacity=20); opacity: .20;
z-index: 999; z-index: 999;
position: fixed; position: fixed;
top: 0; left: 0; top: 0; left: 0;

View File

@ -109,14 +109,10 @@
z-index: 149; z-index: 149;
background-color: rgba(255, 255, 255, .7); background-color: rgba(255, 255, 255, .7);
cursor: pointer; cursor: pointer;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60);
opacity: .6; opacity: .6;
} }
#app-navigation-toggle:hover, #app-navigation-toggle:hover,
#app-navigation-toggle:focus { #app-navigation-toggle:focus {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }

View File

@ -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, input[type="time"]:hover, input[type="time"]:focus, input[type="time"]:active,
textarea:hover, textarea:focus, textarea:active { textarea:hover, textarea:focus, textarea:active {
color: #333; 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"] { margin:0; padding:0; height:auto; width:auto; }
input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } 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; background: #fff url('../img/actions/search.svg') no-repeat .5em center;
border: 0; border: 0;
border-radius: 2em; 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; margin-top: 6px;
float: right; float: right;
} }
@ -343,7 +345,6 @@ input[type="submit"].enabled {
width: 64px; width: 64px;
margin: 0 auto 15px; margin: 0 auto 15px;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
@ -368,7 +369,6 @@ input[type="submit"].enabled {
text-align: center; text-align: center;
color: #ccc; color: #ccc;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60);
opacity: .6; opacity: .6;
} }
/* overrides another !important statement that sets this to unreadable black */ /* overrides another !important statement that sets this to unreadable black */
@ -468,7 +468,6 @@ input[name='password-clone'] {
left: 16px; left: 16px;
top: 22px; top: 22px;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
filter: alpha(opacity=30);
opacity: .3; opacity: .3;
} }
#adminpass-icon, #password-icon { #adminpass-icon, #password-icon {
@ -572,7 +571,6 @@ label.infield {
} }
#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { #show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
filter: alpha(opacity=80);
opacity: .8; opacity: .8;
} }
#show + label, #dbpassword + label, #personal-show + label { #show + label, #dbpassword + label, #personal-show + label {
@ -583,7 +581,6 @@ label.infield {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
filter: alpha(opacity=30);
opacity: .3; opacity: .3;
} }
#pass2, input[name="personal-password-clone"] { #pass2, input[name="personal-password-clone"] {
@ -675,7 +672,6 @@ label.infield {
} }
#body-login .warning legend { #body-login .warning legend {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }
#body-login a.warning { #body-login a.warning {
@ -763,8 +759,7 @@ label.infield {
top: 0; top: 0;
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
filter:alpha(opacity=90);
opacity: .9; opacity: .9;
} }
#notification span, #update-notification span { #notification span, #update-notification span {
@ -775,7 +770,6 @@ label.infield {
tr .action:not(.permanent), tr .action:not(.permanent),
.selectedActions a { .selectedActions a {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0);
opacity: 0; opacity: 0;
} }
tr:hover .action, tr:hover .action,
@ -783,7 +777,6 @@ tr:focus .action,
tr .action.permanent, tr .action.permanent,
.selectedActions a { .selectedActions a {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
tr .action { tr .action {
@ -792,7 +785,6 @@ tr .action {
} }
.header-action { .header-action {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
filter: alpha(opacity=80);
opacity: .8; opacity: .8;
} }
tr:hover .action:hover, tr:hover .action:hover,
@ -802,7 +794,6 @@ tr:focus .action:focus,
.header-action:hover, .header-action:hover,
.header-action:focus { .header-action:focus {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1; opacity: 1;
} }
tbody tr:hover, tbody tr:hover,
@ -981,7 +972,6 @@ div.crumb:focus,
div.crumb a:focus, div.crumb a:focus,
div.crumb:active { div.crumb:active {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter:alpha(opacity=70);
opacity:.7; opacity:.7;
} }

View File

@ -9,7 +9,7 @@ style('core', ['styles', 'header']);
<p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p> <p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p>
<p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p> <p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p>
<p><?php p($l->t('More details can be found in the server log.')) ?></p> <p><?php p($l->t('More details can be found in the server log.')) ?></p>
<br /> <br>
<h2><strong><?php p($l->t('Technical details')) ?></strong></h2> <h2><strong><?php p($l->t('Technical details')) ?></strong></h2>
<ul> <ul>

View File

@ -10,7 +10,7 @@ script('core', [
<input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'> <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'>
<input type='hidden' id='hasMSSQL' value='<?php p($_['hasMSSQL']) ?>'> <input type='hidden' id='hasMSSQL' value='<?php p($_['hasMSSQL']) ?>'>
<form action="index.php" method="post"> <form action="index.php" method="post">
<input type="hidden" name="install" value="true" /> <input type="hidden" name="install" value="true">
<?php if(count($_['errors']) > 0): ?> <?php if(count($_['errors']) > 0): ?>
<fieldset class="warning"> <fieldset class="warning">
<legend><strong><?php p($l->t('Error'));?></strong></legend> <legend><strong><?php p($l->t('Error'));?></strong></legend>

View File

@ -65,7 +65,7 @@
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>> <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>>
<?php if ($_['userAvatarSet']): ?> <?php if ($_['userAvatarSet']): ?>
<img src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>?requesttoken=<?php p(urlencode($_['requesttoken'])); ?>" <img src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>?requesttoken=<?php p(urlencode($_['requesttoken'])); ?>"
alt="" /> alt="">
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
@ -99,7 +99,7 @@
</label> </label>
<input id="searchbox" class="svg" type="search" name="query" <input id="searchbox" class="svg" type="search" name="query"
value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>" value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>"
autocomplete="off" tabindex="3" /> autocomplete="off" tabindex="3">
</form> </form>
</div></header> </div></header>
@ -110,7 +110,7 @@
<li data-id="<?php p($entry['id']); ?>"> <li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>" title="" <a href="<?php print_unescaped($entry['href']); ?>" title=""
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"/> <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>">
<div class="icon-loading-dark" style="display:none;"></div> <div class="icon-loading-dark" style="display:none;"></div>
<span> <span>
<?php p($entry['name']); ?> <?php p($entry['name']); ?>
@ -124,7 +124,7 @@
<li id="apps-management"> <li id="apps-management">
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title="" <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title=""
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>">
<div class="icon-loading-dark" style="display:none;"></div> <div class="icon-loading-dark" style="display:none;"></div>
<span> <span>
<?php p($l->t('Apps')); ?> <?php p($l->t('Apps')); ?>