- removed the "colour sets" from my theme: the color variables (except for

  $link) are no longer needed by the engine so I decided to tidy them up -
  I recommand you to do same if you feel like it (and if you haven't
  already done so).

1 files changed, 6 insertions, 21 deletions

diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 94e590d12..00ad7184a 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -3,21 +3,6 @@
  class Theme {
    var $link = "#666699";
 
-   // color set #1:
-   var $bgcolor1 = "#EAEAEA";   // background color
-   var $fgcolor1 = "#404040";   // table body color
-   var $hlcolor1 = "#666699";   // high-light color
-
-   // color set #2:
-   var $bgcolor2 = "#666699";
-   var $fgcolor2 = "#666699";
-   var $hlcolor2 = "#666699";
-
-   // color set #3:
-   var $bgcolor3 = "#EFEFEF";
-   var $fgcolor3 = "yellow";
-   var $hlcolor3 = "yellow";
-
    function header() {
      global $site_name;
     ?>
@@ -63,7 +48,7 @@
      print " <TR>\n";
      print "  <TD COLSPAN=\"2\">\n";
      if ($story->abstract) print "   <P>". check_output($story->abstract, 1) ."</P>\n";
-     if ($story->updates) print "   <P><FONT COLOR=\"$this->bgcolor2\">". t("Editor's note") .":</FONT> ". check_output($story->updates, 1) ."</P>\n";
+     if ($story->updates) print "   <P><FONT COLOR=\"#666699\">". t("Editor's note") .":</FONT> ". check_output($story->updates, 1) ."</P>\n";
      print "  </TD>\n";
      print " </TR>\n";
      print " <TR><TD COLSPAN=\"2\">&nbsp;</TD></TR>\n";
@@ -82,7 +67,7 @@
      print " <TR>\n";
      print "  <TD COLSPAN=\"2\">\n";
      if ($story->abstract) print "   <P>". check_output($story->abstract, 1) ."</P>\n";
-     if ($story->updates) print "   <P><FONT COLOR=\"$this->bgcolor2\">". t("Editor's note") .":</FONT>". check_output($story->updates, 1) ."</P>\n";
+     if ($story->updates) print "   <P><FONT COLOR=\"#666699\">". t("Editor's note") .":</FONT>". check_output($story->updates, 1) ."</P>\n";
      if ($story->article) print "   <P>". check_output($story->article, 1) ."</P>\n";
      print "  </TD>\n";
      print " </TR>\n";
@@ -110,13 +95,13 @@
      print "  <TD>\n";
      print "   <TABLE BORDER=\"0\" CELLPADDING=\"3\" CELLSPACING=\"1\" WIDTH=\"100%\">\n";
      print "    <TR>\n";
-     print "     <TD BGCOLOR=\"$this->bgcolor1\">\n";
+     print "     <TD BGCOLOR=\"#EAEAEA\">\n";
      print "      <TABLE BORDER=\"0\" CELLPADDING=\"2\" CELLSPACING=\"1\" WIDTH=\"100%\">\n";
      print "       <TR>\n";
 
      // Subject:
      print "        <TD ALIGN=\"right\" WIDTH=\"5%\"><B>". t("Subject") .":</FONT></TD>\n";
-     print "        <TD WIDTH=\"80%\"><B><FONT COLOR=\"$this->hlcolor1\">". check_output($comment->subject) ."</FONT></B></TD>\n";
+     print "        <TD WIDTH=\"80%\"><B><FONT COLOR=\"#666699\">". check_output($comment->subject) ."</FONT></B></TD>\n";
 
      // Moderation:
      print "        <TD ALIGN=\"right\" ROWSPAN=\"3\" VALIGN=\"middle\" WIDTH=\"15%\">\n";
@@ -142,7 +127,7 @@
      if ($comment->comment) print "    <TR><TD BGCOLOR=\"#FFFFFF\">". check_output($comment->comment, 1) ."</TD></TR>\n";
 
      // Print bottom link(s):
-     print "    <TR><TD ALIGN=\"right\" BGCOLOR=\"$this->bgcolor1\">[ $link ]</TD></TR>\n";
+     print "    <TR><TD ALIGN=\"right\" BGCOLOR=\"#EAEAEA\">[ $link ]</TD></TR>\n";
      print "   </TABLE>\n";
      print "  </TD>\n";
      print " </TR>\n";
@@ -156,7 +141,7 @@
      print " <TR>\n";
      print "  <TD>\n";
      print "   <TABLE BORDER=\"0\" CELLPADDING=\"5\" CELLSPACING=\"1\" WIDTH=\"100%\">\n";
-     print "    <TR><TD ALIGN=\"center\" BGCOLOR=\"$this->bgcolor1\" NOWRAP><FONT COLOR=\"$this->fgcolor1\"><B>$subject</B></FONT></TD></TR>\n";
+     print "    <TR><TD ALIGN=\"center\" BGCOLOR=\"#EAEAEA\" NOWRAP><FONT COLOR=\"#404040\"><B>$subject</B></FONT></TD></TR>\n";
      print "    <TR><TD BGCOLOR=\"#FFFFFF\">$content</TD></TR>\n";
      print "   </TABLE>\n";
      print "  </TD>\n";