From: sipb-www <sipb-www@better-mousetrap.mit.edu>
Date: Thu, 15 Jan 2009 04:28:37 +0000 (-0500)
Subject: Merge branch 'master' of /afs/sipb.mit.edu/project/sipb-www/wiki
X-Git-Tag: trac-import~40
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/commitdiff_plain/ce239bcb0fdb0a9837a9c9e5bf653e9638303406?hp=-c

Merge branch 'master' of /afs/sipb.mit.edu/project/sipb-www/wiki
---

ce239bcb0fdb0a9837a9c9e5bf653e9638303406
diff --combined style.css
index 41d1453,4735e62..3d07de0
--- a/style.css
+++ b/style.css
@@@ -78,6 -78,7 +78,6 @@@ ul#navigation li a
  	color:#ffffff;
  	text-decoration: none;
  	text-transform: uppercase;
 -	font-size:1.2em;
  	display:block;
  	width:94px;
  	height:47px;
@@@ -215,7 -216,7 +215,7 @@@ dl.services dd
  	font-weight: bold;
  	font-size:1.2em;
  }
- #highlights-block div{
+ #highlights-block div, #margin-block > div {
  	margin-bottom: 8px;
  }
  .extra-large{
@@@ -325,4 -326,4 +325,4 @@@
  }
  .actions ul li a:hover{
  	text-decoration:underline;
 -}
 +}