From: Biyeun Buczyk <biyeun@mit.edu>
Date: Mon, 12 Jan 2009 02:40:15 +0000 (-0500)
Subject: Merge branch 'master' of git+ssh://sipb-www@scripts.mit.edu/mit/sipb-www/wiki
X-Git-Tag: trac-import~58
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/commitdiff_plain/29f21979d20c82b3ca2af9221540e4968368f8ce?hp=-c

Merge branch 'master' of git+ssh://sipb-www@scripts.mit.edu/mit/sipb-www/wiki
---

29f21979d20c82b3ca2af9221540e4968368f8ce
diff --combined style.css
index 155d812,3429616..aebb074
--- a/style.css
+++ b/style.css
@@@ -41,6 -41,9 +41,9 @@@ a:hover
  	width: 50%;
  }
  
+ #featured-block img{
+ 	float: right;
+ }
  #logo{
  	padding-left: 47px;
  	padding-top:18px;
@@@ -296,31 -299,18 +299,31 @@@ dl.services dd
  	display:none;
  }
  #prefooter{
 -	height: 80px;
 +	height: 120px;
  	clear:both;
  }
 -#admin-nav{
 -	width:100%;
 -}
  #footer{
  	font-size:.9em;
  	clear:both;
  	width:951px;
  	margin: 0 auto;
 -	margin-top:-30px;
 +	margin-top:-65px;
  	text-align:center;
  	color: #545557;
  }
 +.actions ul{
 +	list-style: none;
 +	background-color:#696969;
 +	padding:.5em 0;
 +}
 +.actions ul li{
 +	display: inline;
 +	padding: 0 .5em;
 +}
 +.actions ul li a{
 +	text-decoration: none;
 +	color: #ffffff;
 +}
 +.actions ul li a:hover{
 +	text-decoration:underline;
 +}