Merge branch 'master' of git+ssh://sipb-www@scripts.mit.edu/mit/sipb-www/wiki
authorBiyeun Buczyk <biyeun@mit.edu>
Mon, 12 Jan 2009 02:40:15 +0000 (21:40 -0500)
committerBiyeun Buczyk <biyeun@mit.edu>
Mon, 12 Jan 2009 02:40:15 +0000 (21:40 -0500)
1  2 
style.css

diff --combined style.css
index 155d81288696583f487bb896536e75c98b3c62e6,342961634d88eef75ede723f8d47d2f553474e09..aebb074cebb6d7a009a4333d0380e4667100b6ea
+++ 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;
 +}