Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-01-14 20:28:53 +0300
committerJoas Schilling <coding@schilljs.com>2020-01-14 21:09:27 +0300
commit02c35b1cc7cfa9973940075e27e41d174646e9ac (patch)
treec75547a5841d0868df5d19a1bf5d1da0be5f3ebc
parent13f7f0a72bd70b257977f60424e5d746eb676774 (diff)
Use CSS and JS from the server so the auth page is automatically fixed
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--css/authenticate.css53
-rw-r--r--templates/authenticate.php10
2 files changed, 5 insertions, 58 deletions
diff --git a/css/authenticate.css b/css/authenticate.css
deleted file mode 100644
index 781d9ea03..000000000
--- a/css/authenticate.css
+++ /dev/null
@@ -1,53 +0,0 @@
-form fieldset {
- display: flex !important;
- flex-direction: column;
-}
-
-#password {
- margin-right: 0 !important;
- height: 45px;
- box-sizing: border-box;
- flex: 1 1 auto;
- width: 100% !important;
- min-width: 0; /* FF hack for to override default value */
-
- /* The padding needs to be set here instead of for "input[type="password"]"
- * elements to prevent being overriden by a more specific rule in the
- * server. */
- padding-right: 44px;
-}
-
-input[type="password"]:focus + .icon-confirm:not(:disabled) {
- opacity: .6;
-}
-
-input[type="password"] + .icon-confirm {
- position: absolute;
- right: 15px;
-
- /* Needed to honour the height set below for "input[type='submit']" by
- * overriding a rule set in the server. */
- height: 45px;
-
- border: none;
- /* Needed to override an important rule set in the server. */
- background-color: transparent !important;
-
- opacity: .3;
-}
-
-input[type="password"] + .icon-confirm:hover:not(:disabled),
-input[type="password"] + .icon-confirm:focus:not(:disabled),
-input[type="password"] + .icon-confirm:active:not(:disabled) {
- opacity: 1;
-}
-
-input[type='submit'] {
- width: 45px;
- height: 45px;
- margin-left: 0 !important;
-}
-
-fieldset > p {
- display: inline-flex;
-}
diff --git a/templates/authenticate.php b/templates/authenticate.php
index 023e62685..f62042e1b 100644
--- a/templates/authenticate.php
+++ b/templates/authenticate.php
@@ -1,8 +1,8 @@
<?php
- /** @var $_ array */
- /** @var $l \OCP\IL10N */
- style('spreed', 'authenticate');
- script('spreed', 'authenticate');
+/** @var $_ array */
+/** @var $l \OCP\IL10N */
+style('core', 'publicshareauth');
+script('core', 'publicshareauth');
?>
<form method="post">
<fieldset class="warning">
@@ -16,7 +16,7 @@
<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
<input type="password" name="password" id="password"
placeholder="<?php p($l->t('Password')); ?>" value=""
- autocomplete="off" autocapitalize="off" autocorrect="off"
+ autocomplete="new-password" autocapitalize="off" autocorrect="off"
autofocus />
<input type="submit" id="password-submit"
class="svg icon-confirm input-button-inline" value="" disabled="disabled" />