From: Greg Price <price@mit.edu>
Date: Wed, 11 Feb 2009 08:33:38 +0000 (-0500)
Subject: move local.css into style.css
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/commitdiff_plain/e8cb61edacd944d6c8aceb80f1b2938ad889b9c9?hp=e358788df45401119c1521482fe1bf29fea3e762

move local.css into style.css

There might be a coherent distinction to be had here,
but we don't have it.
---

diff --git a/local.css b/local.css
deleted file mode 100644
index ff41b37..0000000
--- a/local.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.cols:after
-{
-content: "";
-display: block;
-height: 0;
-clear: both;
-}
-
-.col1
-{
-position: relative;
-float: left;
-width: 50%;
-}
-
-.col2
-{
-position: relative;
-float: right;
-align: left;
-width: 50%;
-}
-
-.right
-{
-float: right;
-margin-left: 2em;
-}
diff --git a/style.css b/style.css
index 84b5249..9d8162f 100644
--- a/style.css
+++ b/style.css
@@ -349,3 +349,27 @@ dl.services dd{
 .actions ul li a:hover{
 	text-decoration:underline;
 }
+
+
+.cols:after {
+content: "";
+display: block;
+height: 0;
+clear: both;
+}
+.col1 {
+position: relative;
+float: left;
+width: 50%;
+}
+.col2 {
+position: relative;
+float: right;
+align: left;
+width: 50%;
+}
+
+.right {
+float: right;
+margin-left: 2em;
+}