summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-09-06 21:56:03 +0200
committerJonas Smedegaard <dr@jones.dk>2017-09-06 21:56:03 +0200
commit690b6b44b6210530beb35799d691af67cb4dcdac (patch)
tree3ba623b8699508093a1d0e3b125a7ec2e8012726
parentaaea4df364d1374d83c10f0b001ccf8e57353055 (diff)
Sync with ikiwiki 3.20150610.
-rw-r--r--style.css20
-rw-r--r--templates.mdwn5
-rw-r--r--wikiicons/email.pngbin0 -> 550 bytes
3 files changed, 13 insertions, 12 deletions
diff --git a/style.css b/style.css
index fe1eb90..f0846c0 100644
--- a/style.css
+++ b/style.css
@@ -465,40 +465,40 @@ li.L8 { list-style: upper-alpha; }
display: none;
}
-/* openid selector */
-#openid_choice {
+/* login selector */
+#login_choice {
display: none;
}
-#openid_input_area {
+#login_input_area {
clear: both;
padding: 10px;
}
-#openid_btns, #openid_btns br {
+#login_btns, #login_btns br {
clear: both;
}
-#openid_highlight {
+#login_highlight {
background-color: black;
float: left;
}
-.openid_large_btn {
+.login_large_btn {
padding: 1em 1.5em;
border: 1px solid #DDD;
margin: 3px;
float: left;
}
-.openid_small_btn {
+.login_small_btn {
padding: 4px 4px;
border: 1px solid #DDD;
margin: 3px;
float: left;
}
-a.openid_large_btn:focus {
+a.login_large_btn:focus {
outline: none;
}
-a.openid_large_btn:focus {
+a.login_large_btn:focus {
outline-style: none;
}
-.openid_selected {
+.login_selected {
border: 4px solid #DDD;
}
diff --git a/templates.mdwn b/templates.mdwn
index 80372fc..c45316e 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -92,8 +92,9 @@ Here is a full list of the template files used:
* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
`editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
`editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
- `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
- interface; do not normally need to be customised.
+ `passwordmail.tmpl`, `emailauth.tmpl, `login-selector.tmpl`,
+ `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need
+ to be customised.
[[!meta robots="noindex, follow"]]
diff --git a/wikiicons/email.png b/wikiicons/email.png
new file mode 100644
index 0000000..859251f
--- /dev/null
+++ b/wikiicons/email.png
Binary files differ