From: Paul Baranay <pbaranay@mit.edu>
Date: Wed, 11 Feb 2009 08:35:28 +0000 (-0500)
Subject: Merge branch 'master' of sipb-www@scripts:wiki
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/commitdiff_plain/36fbc1256e3ef2e1ecbfab6567ed58fd9b1b1ca2?hp=9003e87a8e22dcab98de9ac6c408fc287d86b093

Merge branch 'master' of sipb-www@scripts:wiki
---

diff --git a/index.mdwn b/index.mdwn
index 3c255be..93cf3ae 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -30,7 +30,7 @@ Have a computing question or need some help? Come drop by our office.
 ## SIPB Events
 Every year, SIPB offers a number of awesome computer-related events to the MIT community. Here's a list of some of our events:
 
-<div class="right"><img src="photos/hackathon-1.jpg" alt="hackathon" /></div>
+<img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
 * [IAP classes](http://sipb.mit.edu/iap)<br/>
 Teach or learn.  Knowledge is power. <br />
 * [SIPB Cluedumps](http://cluedumps.mit.edu/) <br />
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;
+}