Updated main header to use floats instead of tables.
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Mon, 23 Jul 2007 07:06:59 +0000 (03:06 -0400)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Mon, 23 Jul 2007 07:06:59 +0000 (03:06 -0400)
Added spacing to default.css.
Updated acm logo to remove some whitespace.

default.css
logos/acm_logo.gif
logos/uw_logo.gif [new file with mode: 0644]
logos/uw_logo_100_68.gif [deleted file]
xsl/common.xsl

index f085f22..f0cf241 100644 (file)
@@ -1,11 +1,11 @@
 body {
     background: white;
     color: black;
-    font-family:serif;
-       font-size:12px;
-       width:760px;
-       margin:0 auto;
-       padding:0 20px;
+    font-family: serif;
+       font-size: 12px;
+       width: 760px;
+       margin: 0 auto;
+       padding: 0 20px;
 }
 
 h1 {
@@ -13,10 +13,10 @@ h1 {
 }
 h2 {
     font-size: large;
-       font-family:'Lucida Grande', Sans, Sans-serif;
+       font-family: 'Lucida Grande', Sans, Sans-serif;
        text-transform: uppercase;
-    border-left:10px solid #ff9900;
-       padding-left:10px;
+    border-left: 10px solid #ff9900;
+       padding-left: 10px;
     color: #000055;
 }
 h3 {
@@ -107,7 +107,7 @@ tr.book2 {
 }
 
 img {
-       border-width:0;
+       border-width: 0;
 }
 
 div.footerlogo {
@@ -116,7 +116,7 @@ div.footerlogo {
 }
 
 p {
-       font-family:'Lucida Grande', Sans, Sans-serif;
+       font-family: 'Lucida Grande', Sans, Sans-serif;
 }
 
 div.webcam {
@@ -124,116 +124,113 @@ div.webcam {
 }
 
 div.biglogo {
-       background:url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
-    height:340px;
+       background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
+    height: 340px;
 }
-
-div.biglogo table {
-    float:left;
+div.uwlogo {
+    margin-top: 16px;
+    float: left;
+}
+div.acmlogo {
+    margin-top: 12px;
+    float: left;
 }
 
 table.template-header {
-       border-bottom:1px solid #ccc;
-       /*background-color:#cee6ff;*/
-       /*padding-top:65px;*/
+       border-bottom: 1px solid #ccc;
 }
 
 div.webtitle {
-       /*position:absolute;
-       top:0;
-       left:0;*/
-    height:60px;
-       width:760px;
-       background-color:#215498;
-    border-bottom:4px solid #104387;
+    height: 60px;
+       width: 760px;
+       background-color: #215498;
+    border-bottom: 4px solid #104387;
 }
 
 div.webtitle div.webtitle-inner {
-       width:760px;
-       padding:0 10px;
+       width: 760px;
+       padding: 0 10px;
 }
 
 div.menuspace {
-       background:white;
+       background: white;
 }
 
 div.menuspace table.menubar {
        background-color: transparent;
-       padding:0;
-       margin:0 auto;
+       padding: 0;
+       margin: 0 auto;
        text-align: center;
-    height:90px;
+    height: 90px;
     vertical-align: middle;
-    font-size:11px;
+    font-size: 11px;
     text-transform: uppercase;
 }
 
 div.menuspace td.menuitem {
-       margin:0;
-       padding:0;
+       margin: 0;
+       padding: 0;
     text-align: center;
 }
 
 div.menuspace td.menuitem a {
-       display:block;
-       text-align:center;
-       padding:5px;
-       margin:0;
-       text-decoration:none;
-       font-weight:400;
-       font-family:'Lucida Grande', Sans, Sans-serif;
+       display: block;
+       text-align: center;
+       padding: 5px;
+       margin: 0;
+       text-decoration: none;
+       font-weight: 400;
+       font-family: 'Lucida Grande', Sans, Sans-serif;
 }
 
 div.menuspace td.menuitem a:hover {
-       font-weight:700;
-       color:black;
-       background-color:#eee;
-    border:1px solid #ccc;
+       font-weight: 700;
+       color: black;
+       background-color: #eee;
+    border: 1px solid #ccc;
 }
 
 div.menuspace div.menuitem a:hover img {
-       width:60px;
-       height:60px;
+       width: 60px;
+       height: 60px;
 }
 
 a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
-       font-family:'Lucida Grande', Sans, Sans-serif;
-       border-left:4px solid #ccc;
-       padding:0 15px 0 5px;
-       color:blue;
+       font-family: 'Lucida Grande', Sans, Sans-serif;
+       border-left: 4px solid #ccc;
+       padding: 0 15px 0 5px;
+       color: blue;
 }
 
 a.diritem:hover {
-       border-left:4px solid green;
+       border-left: 4px solid green;
 }
 
 a.headdir {
-       font-weight:700;
+       font-weight: 700;
 }
 
 a.pagetop, a.pagetop:link, a.pagetop:visited, a.pagetop:hover {
-       font-family:'Lucida Grande',sans, sans-serif;
-       display:block;
-       padding:0 10px 10px 10px;
-       margin:10px 0 0 0;
-       border-top:1px solid #ccc;
-       background-color:#eee;
-       color:#999;
-       font-size:9px;
-       text-align:right;
-       text-transform:uppercase;
+       font-family: 'Lucida Grande',sans, sans-serif;
+       display: block;
+       padding: 0 10px 10px 10px;
+       margin: 10px 0 0 0;
+       border-top: 1px solid #ccc;
+       background-color: #eee;
+       color: #999;
+       font-size: 9px;
+       text-align: right;
+       text-transform: uppercase;
 }
 
 div.footer {
-       /*margin-top:10px;*/
-       padding-top:10px;
-       border-top:1px solid #ccc;
-       font-size:10px;
-       color:#666;
-       /*background:url('/logos/csc_80_35.png') right bottom no-repeat transparent;*/
+       padding-top: 10px;
+       border-top: 1px solid #ccc;
+       font-size: 10px;
+       color: #666;
 }
 
 p.infobox {
-       border:1px solid #ccc;
-       padding:5px 10px;
+       border: 1px solid #ccc;
+       padding: 5px 10px;
 }
index b617992..202dfcc 100644 (file)
Binary files a/logos/acm_logo.gif and b/logos/acm_logo.gif differ
diff --git a/logos/uw_logo.gif b/logos/uw_logo.gif
new file mode 100644 (file)
index 0000000..47b2562
Binary files /dev/null and b/logos/uw_logo.gif differ
diff --git a/logos/uw_logo_100_68.gif b/logos/uw_logo_100_68.gif
deleted file mode 100644 (file)
index 3c02e0a..0000000
Binary files a/logos/uw_logo_100_68.gif and /dev/null differ
index 272aed8..e73ff67 100644 (file)
 
 <xsl:template match="biglogo" name="biglogo">
   <div class="biglogo">
+    <div class="uwlogo">
+      <a href="http://www.uwaterloo.ca/"><img src="{$pre}logos/uw_logo.gif"
+          alt="University of Waterloo" width="105" height="70" /></a>
+    </div>
+    <div class="acmlogo">
+      <a href="http://www.acm.org"><img src="{$pre}logos/acm_logo.gif"
+           alt="A Student Chapter of the ACM" width="82" height="88" /></a>
+    </div>
+<!--
     <table cellspacing="0" cellpadding="0" border="0">
       <tr><td>
         <a href="http://www.uwaterloo.ca/"><img 
-           src="{$pre}logos/uw_logo_100_68.gif" alt="University of Waterloo"
-           width="100" height="68" /></a>
+           src="{$pre}logos/uw_logo.gif" alt="University of Waterloo"
+           width="105" height="70" /></a>
       </td><td>
         <a href="http://www.acm.org"><img width="82" height="103" 
            src="{$pre}logos/acm_logo.gif"
            alt="A Student Chapter of the ACM" /></a>
       </td></tr>
     </table>
+-->
   </div>
 </xsl:template>