Merge pull request #2167 from owncloud/input-type-fix

Input type fix
This commit is contained in:
Frank Karlitschek 2013-03-07 07:28:22 -08:00
commit 19073e0711
2 changed files with 15 additions and 6 deletions

View File

@ -16,7 +16,7 @@
<?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> /> <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
<label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/> <label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/>
<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>' <input type="text" name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
title="<?php p($l->t( '0 is unlimited' )); ?>" title="<?php p($l->t( '0 is unlimited' )); ?>"
<?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br /> <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
<em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br /> <em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br />

View File

@ -35,9 +35,9 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
.header-right { float:right; vertical-align:middle; padding:0 0.5em; } .header-right { float:right; vertical-align:middle; padding:0 0.5em; }
.header-right > * { vertical-align:middle; } .header-right > * { vertical-align:middle; }
/* INPUTS */ /* INPUTS */
input[type="text"], input[type="password"], input[type="number"] { cursor:text; } input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"],
input[type="text"], input[type="password"], input[type="search"], input[type="number"],
textarea, select, button, .button, #quota, div.jp-progress, .pager li a { textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
width:10em; margin:.3em; padding:.6em .5em .4em; width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em; font-family:Arial, Verdana, sans-serif; font-size:1em; font-family:Arial, Verdana, sans-serif;
@ -46,13 +46,22 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
} }
input[type="hidden"] { height:0; width:0; } input[type="hidden"] { height:0; width:0; }
input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; } input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea {
input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } background:#f8f8f8; color:#555; cursor:text;
}
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] {
-webkit-appearance:textfield; -moz-appearance:textfield;
-webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box;
}
input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active, input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
textarea:hover, textarea:focus, textarea:active {
background-color:#fff; color:#333;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: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; }
#quota { cursor:default; } #quota { cursor:default; }