Merge /users/jy2wong/www/rofl/csc

master
Jacob Parker 11 years ago
commit e14d117f46
  1. 2
      bin/members.py
  2. 139
      pub/style/style.css

@ -29,7 +29,7 @@ print "<p>The members for " + term2 + " " + str(year) + " are listed here. We cu
print "Use of this list for solicitation of any form is prohibited. If you wish to get in touch with the membership as a whole please contact <a href=\"mailto:exec@csclub.uwaterloo.ca\">the Executive</a>.</p>"
print "<center>"
print "<table>"
print " <tr><td>Name</td><td>Program</td><td>Username</td>"
print " <tr><th>Name</th><th>Program</th><th>Username</th>"
for (_, member) in members:
if not 'program' in member:
member['program'] = ['']

@ -95,23 +95,7 @@ margin: 0;
padding: 0;}
.headerTitle a:hover { text-decoration: none; }
.subHeader {
display: none;
color: white;
background-color: rgb(0,51,153);
margin: 0;
padding: 1ex 1ex 1ex 1.5mm;
}
.subHeader a {
color: white;
background-color: transparent;
font-weight: bold;
margin: 0;
padding: 0 0.75ex 0 0.5ex;
}
.superHeader .highlight, .subHeader .highlight {
.superHeader .highlight, {
color: rgb(253,160,91);
background-color: transparent;
}
@ -227,83 +211,11 @@ padding: 0;}
/* # Side # */
#side-bar {
width: 16em;
float: left;
clear: left;
border-right: 1px solid #ddd;
}
#side-bar div {
border-bottom: 1px solid #ddd;
}
.sideBarTitle {
font-weight: bold;
margin: 0 0 0.5em 2mm;
padding: 1em 0 0 0;
}
#side-bar ul {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0 0 0.3em 0;
}
li ul {
padding-left: 0.6em !important;
}
#side-bar li {
margin: 0;
}
#side-bar a {
color: #43547e;
background-color: transparent;
margin: 0;
padding: 0.25em 1ex 0.25em 2mm;
display: block;
text-transform: capitalize;
font-weight: bold!important;
font-size: 102%;
border-left: white solid 0.2em;
}
#side-bar li.thisPage a {
color: black!important;
background-color: white;
font-style:italic;
}
#side-bar a:hover {
color: white;
background-color: rgb(100,135,220);
border-left: black solid 0.2em;
text-decoration: none;
}
.sideBarText {
line-height: 1.5em;
margin: 0 0 1em 0;
padding: 0 1.5ex 0 2.5mm;
display: block;
}
#side-bar .sideBarText a {
margin: 0;
padding: 0;
display: inline;
}
#side-bar .sideBarText a:hover {
color: #43547e;
background-color: transparent;
text-decoration: none;
}
/* # Main Copy # */
#main-copy {
/*
@ -381,17 +293,6 @@ li ul {
#main-copy ol {
}
#main-copy .topOfPage {
color: #43547e;
background-color: transparent;
font-size: 91%;
font-weight: bold;
text-decoration: none;
margin: 3ex 1ex 0 0;
padding: 0;
float: right;
}
dl {
margin: 1em 1ex 2em 1ex;
padding: 0;
@ -441,16 +342,25 @@ dd {
/* GENERAL */
table {
border: solid 1px black;
background-color: #fff;
border-collapse: collapse;
border: 2px solid #fff;
outline: 1px solid #4a47ae;
}
th {
background-color: #abc;
border: solid 1px black;
text-align: center;
background-color: #aaa;
color: #fff;
text-align: left;
background-color: #4A47AE;
}
tr:nth-child(odd) {
background-color: #c0ffee;
background-color: #d3dfee;
}
td {
background-color: #def;
border: solid 1px black;
td a {
background-color: transparent !important;
}
hr {
@ -458,13 +368,6 @@ hr {
border-color: black;
}
acronym, .titleTip {
border-bottom: 1px solid #ddd;
cursor: help;
margin: 0;
padding: 0 0 0.4px 0;
}
pre {
margin-left: 2em;
font-size: 1.2em;
@ -475,14 +378,6 @@ blockquote {
font-style: italic;
}
.smallCaps {
font-size: 110%;
font-variant: small-caps;
}
.doNotDisplay { display: none; }
.notify_errors,
.notify_notes,
.notify_success { padding: .8em; margin-bottom: 1em; border: 2px solid #ddd; }

Loading…
Cancel
Save