diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-07 14:16:32 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-07 14:16:32 -0500 |
| commit | 2012603b74eac491a86563787d21638647533147 (patch) | |
| tree | fe612b4229ce6da6aecd8070be651b8a3c4f737a /core | |
| parent | d39655e1269494dd1c8cad06c972e8884cace8ea (diff) | |
| parent | 861f32a22b04d7052412f76d4fa22c29916971f8 (diff) | |
| download | nextcloud-server-2012603b74eac491a86563787d21638647533147.tar.gz nextcloud-server-2012603b74eac491a86563787d21638647533147.zip | |
Merge branch 'master' into fix-issue-1085
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/templates/installation.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 6e1cef72eda..376e3a2f49b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -34,7 +34,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC /* INPUTS */ input[type="text"], input[type="password"] { cursor:text; } -input:not([type="checkbox"]), textarea, select, button, .button, #quota, div.jp-progress, .pager li a { +input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a { width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; font-family:Arial, Verdana, sans-serif; background:#fff; color:#333; border:1px solid #ddd; outline:none; diff --git a/core/templates/installation.php b/core/templates/installation.php index 28fbf29b540..3128c4f2e70 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -113,7 +113,7 @@ </p> <p class="infield groupmiddle"> <label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label> - <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" /> + <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> </p> </div> <?php endif; ?> |