From 2d28e97c1518fcc8780b935fcb951a8638ec7c59 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 9 Oct 2010 15:48:32 -0700
Subject: [PATCH] Revert "webapps.mason: move some CSS from
 websites.factorcode"

This reverts commit 4d42813e751858fee54fc90a23507a10b2c74184.
---
 extra/webapps/mason/downloads.css    |  55 -------------
 extra/webapps/mason/downloads.xml    |   2 -
 extra/websites/factorcode/master.css | 115 +++++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 57 deletions(-)
 delete mode 100644 extra/webapps/mason/downloads.css

diff --git a/extra/webapps/mason/downloads.css b/extra/webapps/mason/downloads.css
deleted file mode 100644
index 164aa4467b..0000000000
--- a/extra/webapps/mason/downloads.css
+++ /dev/null
@@ -1,55 +0,0 @@
-#downloads {
-	width: 520px;
-	padding: 0;
-	margin: 0;
-}
-
-th {
-	font: bold 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	color: #4f6b72;
-	border-right: 1px solid #C1DAD7;
-	border-bottom: 1px solid #C1DAD7;
-	border-top: 1px solid #C1DAD7;
-	letter-spacing: 2px;
-	text-transform: uppercase;
-	padding: 6px 6px 6px 6px;
-	background: #CAE8EA url(bg_header.jpg) no-repeat;
-}
-
-th.nobg {
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px solid #C1DAD7;
-	background: none;
-}
-
-td.alt {
-	background: #F5FAFA;
-	color: #797268;
-}
-
-td.doesnotexist {
-	background: #E5EAEA;
-}
-
-
-td.unsupported {
-	background: #ffaaaa;
-}
-
-
-td.supported {
-	background: #aaffaa;
-}
-
-td.supported :hover { background-color: #88ff88; }  
-
-td.nobinary {
-	background: #eeee88;
-}
-
-div.bigdiv {
-	width: 100px;
-	text-align: center;
-	color: #050;
-}
diff --git a/extra/webapps/mason/downloads.xml b/extra/webapps/mason/downloads.xml
index f07bae09d8..60a268435e 100644
--- a/extra/webapps/mason/downloads.xml
+++ b/extra/webapps/mason/downloads.xml
@@ -1,7 +1,5 @@
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-<t:style t:include="resource:extra/webapps/mason/downloads.css" />
-
 <h2>Stable release: <t:link t:name="stable-release" /></h2>
 
 <table id="mytable" cellspacing="0" summary="Stable releases">
diff --git a/extra/websites/factorcode/master.css b/extra/websites/factorcode/master.css
index ff4577bddf..72088b72ab 100644
--- a/extra/websites/factorcode/master.css
+++ b/extra/websites/factorcode/master.css
@@ -22,8 +22,123 @@ a:hover {
 	border-bottom:1px solid #ccc;
 }
 
+ol.subnav {
+	margin:-10px -10px 0 -5px;
+	padding:0;
+}
+
+ol.subnav li {
+	font:85%/0.9em "Lucida Grande", "Lucida Sans Unicode", verdana, geneva, sans-serif;
+	float:left;
+	list-style:none;
+	margin:0;
+	padding:0;
+}
+
+ol.subnav a {
+	font-weight:bold;
+	color:#555;
+	border-top:2px solid #fff;
+	display:block;
+	padding:5px;
+	text-decoration:none;
+	margin:0 5px 0 0;
+	border-bottom:none;
+}
+
+ol.subnav a:hover {
+	border-top:2px solid #943329;
+	color:#121212;
+	border-bottom:none;
+}
+
+#downloads {
+	width: 520px;
+	padding: 0;
+	margin: 0;
+}
+
+caption {
+	padding: 0 0 5px 0;
+	width: 520px;	 
+	font: italic 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	text-align: right;
+}
+
+th {
+	font: bold 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	color: #4f6b72;
+	border-right: 1px solid #C1DAD7;
+	border-bottom: 1px solid #C1DAD7;
+	border-top: 1px solid #C1DAD7;
+	letter-spacing: 2px;
+	text-transform: uppercase;
+	padding: 6px 6px 6px 6px;
+	background: #CAE8EA url(bg_header.jpg) no-repeat;
+}
+
+th.nobg {
+	border-top: 0;
+	border-left: 0;
+	border-right: 1px solid #C1DAD7;
+	background: none;
+}
+
 pre {
 	border: 1px dashed #ccc;
 	background-color: #f5f5f5;
 	font-size: 120%;
 }
+
+td.alt {
+	background: #F5FAFA;
+	color: #797268;
+}
+
+td.doesnotexist {
+	background: #E5EAEA;
+}
+
+
+td.unsupported {
+	background: #ffaaaa;
+}
+
+
+td.supported {
+	background: #aaffaa;
+}
+
+td.supported :hover { background-color: #88ff88; }  
+
+td.nobinary {
+	background: #eeee88;
+}
+
+div.bigdiv {
+	width: 100px;
+	text-align: center;
+	color: #050;
+}
+
+th.spec {
+	border-left: 1px solid #C1DAD7;
+	border-top: 0;
+	background: #fff;
+	font: bold 10px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+}
+
+th.specalt {
+	border-left: 1px solid #C1DAD7;
+	border-top: 0;
+	background: #f5fafa;
+	font: bold 10px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	color: #797268;
+}
+
+th.allbg {
+	border-top: 0;
+	border-left: 0;
+	border-right: 0;
+	background: none;
+}