Merge branch 'ikiwiki' into fixupfixup

3 files changed, 11 insertions, 11 deletions

diff --git a/goldtype/background_darkness.png b/goldtype/background_darkness.png
index 0a1cb4e..154ae83 100644
--- a/goldtype/background_darkness.png
+++ b/goldtype/background_darkness.png
diff --git a/goldtype/header_background.png b/goldtype/header_background.png
index 50b11dd..319831a 100644
--- a/goldtype/header_background.png
+++ b/goldtype/header_background.png
diff --git a/goldtype/style.css b/goldtype/style.css
index 86d57af..e4a3b9f 100644
--- a/goldtype/style.css
+++ b/goldtype/style.css
@@ -10,7 +10,7 @@ footer,header,hgroup,menu,nav,section {
 	display: block;
 }
 
-.header {
+div.header, header.header {
 	margin: 0;
 	font-size: 140%;
 	font-weight: bold;
@@ -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;
 }