diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html index f1654d6f..3076ec18 100644 --- a/internal/template/templates/common/layout.html +++ b/internal/template/templates/common/layout.html @@ -9,7 +9,7 @@ - + diff --git a/internal/template/templates/views/login.html b/internal/template/templates/views/login.html index 8d611f4b..133ea743 100644 --- a/internal/template/templates/views/login.html +++ b/internal/template/templates/views/login.html @@ -20,11 +20,13 @@ {{ if .webAuthnEnabled }} - -
- +
+ +
+ +
{{ end }} {{ if hasOAuth2Provider "google" }} diff --git a/internal/template/templates/views/settings.html b/internal/template/templates/views/settings.html index 3b6f5692..83354d77 100644 --- a/internal/template/templates/views/settings.html +++ b/internal/template/templates/views/settings.html @@ -46,55 +46,56 @@
- + + + {{ if .webAuthnEnabled }} +
+ {{ t "page.settings.webauthn.passkeys" }} - {{ if .webAuthnEnabled }} -
- {{ t "page.settings.webauthn.passkeys" }} + + {{ if .webAuthnCerts}} + + + + + + + + {{ range .webAuthnCerts }} + + + + + + + {{ end }} +
{{ t "page.settings.webauthn.passkey_name" }}{{ t "page.settings.webauthn.added_on" }}{{ t "page.settings.webauthn.last_seen_on" }}{{ t "page.settings.webauthn.actions" }}
{{ .Name }}{{ elapsed $.user.Timezone .AddedOn }}{{ elapsed $.user.Timezone .LastSeenOn }} + {{ icon "delete" }}{{ t "action.remove" }} + {{ icon "edit" }} {{ t "action.edit" }} +
+ {{ end }} +
- {{ if gt .countWebAuthnCerts 0}} - {{ end }}
- {{ if .webAuthnCerts}} -
- - - - - - - - {{ range .webAuthnCerts }} - - - - - - - {{ end }} -
{{ t "page.settings.webauthn.passkey_name" }}{{ t "page.settings.webauthn.added_on" }}{{ t "page.settings.webauthn.last_seen_on" }}{{ t "page.settings.webauthn.actions" }}
{{ .Name }}{{ elapsed $.user.Timezone .AddedOn }}{{ elapsed $.user.Timezone .LastSeenOn }} - {{ icon "delete" }}{{ t "action.remove" }} - {{ icon "edit" }} {{ t "action.edit" }} -
-
- {{ end }}
- {{ end }} + {{ end }}
{{ t "form.prefs.fieldset.reader_settings" }} diff --git a/internal/ui/static/css/common.css b/internal/ui/static/css/common.css index 1d8519b7..ee511840 100644 --- a/internal/ui/static/css/common.css +++ b/internal/ui/static/css/common.css @@ -363,7 +363,7 @@ input[type="number"] { font-size: 99%; margin-bottom: 10px; margin-top: 5px; - -webkit-appearance: none; + appearance: none; } input[type="search"]:focus, @@ -393,7 +393,7 @@ textarea { padding: 3px; margin-bottom: 10px; margin-top: 5px; - -webkit-appearance: none; + appearance: none; } textarea:focus { @@ -440,8 +440,7 @@ a.button { .button { display: inline-block; - -webkit-appearance: none; - -moz-appearance: none; + appearance: none; font-size: 1.1em; cursor: pointer; padding: 3px 10px;