Merge commit 'upstream/master'

4 files changed, 0 insertions, 125 deletions

diff --git a/view/theme/goldenrod/screenshot.jpg b/view/theme/goldenrod/screenshot.jpg
deleted file mode 100644
index 357e00ae2..000000000
--- a/view/theme/goldenrod/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
deleted file mode 100755
index 47985aaa8..000000000
--- a/view/theme/goldenrod/style.css
+++ /dev/null
@@ -1,121 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-	background: #CCC;
-}
-
-#banner {
-	color: #444444;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-	color: #000000;
-}
-
-body { 
-	background: #FFFFFF;
-	color: #000000;
-}
-.nav-selected {
-	background: #FFFFFF !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #FFEEBB;
-	color: #000000;
-	border: 1px solid #000000;
-}
-
-input, select {
-	background-color: #FFEEBB;
-	color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-	background: #FFDDAA;
-	color: #0000EE;
-}
-option {
-	background-color: #FFEEBB;
-}
-#page-footer {
-	border: none;
-}
-
-nav {
-	background: #FFEEBB;
-}
-
-
-
-body { 
-	background: #FFDDAA;
-	color: #444444;
-}
-
-.nav-link {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-commlink {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-selected {
-	background: #FFDDAA !important;
-}
-
-.tab {
-	color: #444444;
-	background: #FFCC55;
-
-}
-
-a, a:visited {
-	color: #8888FF;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0000FF;
-	text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-	color: #8888FF;
-}
-
-.fakelink:hover {
-	color: #0000FF;
-}
-
-
-
-.wall-item-content-wrapper.comment {
-	background: #FFCC55;
-}
-
-.comment-edit-wrapper {
-	background: #FFCC55;
-}
-
-.comment-wwedit-wrapper {
-	background: #FFCC55;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-	color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-	color: #0000FF;
-}
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/goldenrod/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/goldenrod/unsupported b/view/theme/goldenrod/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/goldenrod/unsupported
+++ /dev/null