diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2011-10-08 15:47:03 +0100 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2011-10-08 15:47:03 +0100 |
| commit | deaeab3d92ed8f536789a142828549957130dc1c (patch) | |
| tree | 34b7cfe4372478835334749fcca7f73b8f8ea633 /core | |
| parent | adebefad84e06d15a9bc5e1fadb4846c636b3347 (diff) | |
| parent | bbd96fdd39902ae0c2c52342627f705c592d720b (diff) | |
| download | nextcloud-server-deaeab3d92ed8f536789a142828549957130dc1c.tar.gz nextcloud-server-deaeab3d92ed8f536789a142828549957130dc1c.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 1 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 5d4df586a8e..46b340be961 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -34,6 +34,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end input[type="text"], input[type="password"] { cursor:text; } input, select, .button, #quota, div.jp-progress, .pager li a { font-size:1em; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; } input[type="text"], input[type="password"], input[type="search"] { background:#f8f8f8; color:#555; cursor:text; } +input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -webkit-box-sizing:content-box; } input[type="text"]:hover, input[type="text"]:focus, input[type="password"]:hover, input[type="password"]:focus, input[type="search"]:hover, input[type="search"]:focus { background:#fff; color:#333; } input[type="submit"], input[type="button"], .button, #quota, div.jp-progress, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 96f3d2662fb..e1f8928fc9b 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -32,6 +32,6 @@ </div></header> <?php echo $_['content']; ?> </div> - <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a>: <?php echo $l->t( 'web services under your control' ); ?></p></footer> + <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t( 'web services under your control' ); ?></p></footer> </body> </html> |