Merge remote branch 'upstream/master' into prv/po

6 files changed, 29 insertions, 6 deletions

diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index c5925cedd..749d9b21e 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -69,11 +69,11 @@ body {
 
 .pageheader .actions {
 	position: absolute;
-	bottom: 5px;
+	bottom: 0;
 	right: 2em;
 	width: 100%;
 	text-align: right;
-	padding: 0;
+	padding: 2px;
 }
 
 #content, #comments, #footer {
@@ -97,8 +97,7 @@ body {
 
 h1 { font: 120% sans-serif }
 h2 { font: bold 100% sans-serif }
-h3 { font: italic 100% sans-serif }
-h4, h5, h6 { font: small-caps 100% sans-serif }
+h3, h4, h5, h6 { font: bold 80% sans-serif }
 
 /* Smaller headings for inline pages */
 .inlinepage h1 { font-size: 110% }
diff --git a/themes/blueview/style.css b/themes/blueview/style.css
index 540cac415..c07d1cdfa 100644
--- a/themes/blueview/style.css
+++ b/themes/blueview/style.css
@@ -197,14 +197,14 @@ body {
 	font-weight: bold;
 }
 
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li {
 	padding: 0.25em 0.25em 0.25em 0.25em;
 	background-image: url('background_darkness.png');
 	background-repeat: repeat;
 	color: white;
 }
 
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a {
 	color: white;
 	text-decoration: none;
 }
diff --git a/themes/goldtype/background_darkness.png b/themes/goldtype/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
--- /dev/null
+++ b/themes/goldtype/background_darkness.png
diff --git a/themes/goldtype/base.css b/themes/goldtype/base.css
new file mode 120000
index 000000000..d9318772d
--- /dev/null
+++ b/themes/goldtype/base.css
@@ -0,0 +1 @@
+../blueview/style.css
\ No newline at end of file
diff --git a/themes/goldtype/header_background.png b/themes/goldtype/header_background.png
new file mode 100644
index 000000000..50b11dd23
--- /dev/null
+++ b/themes/goldtype/header_background.png
diff --git a/themes/goldtype/style.css b/themes/goldtype/style.css
new file mode 100644
index 000000000..9c217c746
--- /dev/null
+++ b/themes/goldtype/style.css
@@ -0,0 +1,23 @@
+/*
+ * goldtype theme for ikiwiki
+ */
+
+.pageheader {
+	background-repeat: no-repeat;
+	background-color: #f2d98d;
+	padding: 0;
+	padding-right: 1em;
+	margin-bottom: 2em;
+}
+
+html, body {
+	background-color: #f2d98d;
+}
+
+#content a:hover, #comments a:hover, .sidebar a:hover,
+#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover {
+    color: red;
+}
+#content a:visited, #comments a:visited, .sidebar a:visited {
+    color: #37485e;
+}