Index: openacs-4/packages/acs-subsite/www/resources/site-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/resources/site-master.css,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-subsite/www/resources/site-master.css	6 Aug 2006 20:57:31 -0000	1.27
+++ openacs-4/packages/acs-subsite/www/resources/site-master.css	5 May 2007 13:07:35 -0000	1.28
@@ -1,98 +1,58 @@
+/* Styles originally defined in default-master.css */
 
-/**********************************************************************
-/* Site-Wide/Master Templates
-/**********************************************************************/
-
-/* BODY tag */
-
-body {
-  font-family: verdana, helvetica, arial, sans-serif;
-  background-color: white;
-  margin: 0px;
+#login-box {
+  border: black 1px solid;
+  padding: 4px;
 }
 
-
-/* Site Header */
-
-#site-header {
-  background-color: #313063; 
-  color: white;
-  font-family: tahoma, verdana, helvetica, sans-serif;
+TABLE.table-display {
+  font-family: tahoma, verdana, helvetica; 
   font-size: 85%;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  padding-left: 8px;
-  padding-right: 8px;
-  text-align: center;
 }
 
-#site-header .system-name {
-  font-size: 120%;
-  font-weight: bold;
-  float: left;
+TR.table-header {
+  background-color: #cccccc; 
 }
-#site-header .system-name a {
-  color: white;
-  text-decoration: none;
-}
-#site-header .system-name a:hover {
-  color: white;
-  text-decoration: none;
-}
 
-#site-header .users-online {
-  display: inline;
-  float: right;
-  padding-right: 4em;
+TR.even {
+  background-color: #f0f0f0;
 }
 
-#site-header .user-greeting {
-  display: inline;
+TR.odd {
+  background-color: #e0e0e0;
 }
 
-#site-header .permanent-navigation {
-  display: inline;
-  float: right;
-}
+/* Replace deprecated center tags in forms. Eventually all forms should use form builder and this tag should not be used */
 
-#site-header .action-list a { 
-  border: solid 1px #313063;
-  text-align: center; 
-  padding: 1px;
-  padding-left: 4px;
-  padding-right: 4px;
-  color: white;
-  text-decoration: none;
+DIV.submit-button {
+  text-align: center;
 }
-#site-header .action-list a:hover { 
-  text-decoration: none;
-  background-color: #666666;
-  border: solid 1px #999999;
-}
 
 
+/**********************************************************************
+/* Site-Wide/Master Templates
+/**********************************************************************/
 
+#skiptocontent {
+  display: none;
+}
+
+.block-marker {display: none;}
+
 /* User Messages */
 
-#user-message {
+#alert-message {
   background-color: #ccff99; 
   padding: 4px;
   padding-top: 6px;
   padding-bottom: 6px;
   font-size: 85%;
 }
 
-#user-message ul {
+#alert-message .alert {
   margin-left: 0;
-  padding-left: 0;
-  display: inline;
-  border: none;
-} 
-#user-message ul li {
-  margin-left: 0;
   padding-left: 2px;
   border: none;
-  list-style: none;
 }
 
 
@@ -118,41 +78,6 @@
 }
 
 
-/* Context Bar */
-
-#context-bar {
-  font-family: Arial, sans-serif;
-  font-size: 11px;
-  margin-bottom: 2px;
-  padding-left: 8px;
-}
-#context-bar .breadcrumbs {
-  clear: left;
-  float: left;
-  padding-top: 3px;
-}
-#context-bar .breadcrumbs ul {
-  display: inline;
-  margin-left: 0;
-  padding-left: 0;
-  display: inline;
-  border: none;
-} 
-#context-bar .breadcrumbs ul li {
-  list-style: none;
-  display: inline;
-  margin-left: 0;
-  padding-left: 2px;
-  border: none;
-  list-style: none;
-  display: inline;
-}
-#context-bar #navlinks {
-  float: right;
-}
-
-
-
 /* Subsite Name */
 
 #subsite-name { 
@@ -170,26 +95,10 @@
   text-decoration: none;
 }
 
-/* This wraps everything except site-header and site-footer, and is used to ensure proper margins */
-/* Only used on non-tabbed (navbar and subnavbar) pages */
 
-#page-body {
-  margin-left: 8px;
-  margin-right: 8px;
-}
-
-
-
-
-/* Title of page, typically used on an H1 tag */
-
-.page-title {
-}
-
-
 /* Site Footer */
 
-#site-footer {
+#footer {
   clear: both;
   border-top: 1px solid #ccc;
   font-family: tahoma, verdana, helvetica, sans-serif;
@@ -202,30 +111,25 @@
   text-align: center;
 }
 
-#site-footer ul {
+#footer ul {
   display: inline;
   margin-left: 0;
   padding-left: 0;
   border: none;
 }
 
-#site-footer ul li {
+#footer ul li {
   margin-left: 0;
   padding-left: 10px;
   border: none;
   list-style: none;
   display: inline;
 }
 
-#site-footer .action-list {
+#footer .action-list {
   float: left;
 }
 
-
-
-
-
-
 /**********************************************************************
 /* General navigation
 /**********************************************************************/
@@ -335,7 +239,6 @@
   color: black;
 }
 
-
 #subnavbar-body { 
   border-bottom: 1px solid #016799;
   border-left: 1px solid #016799;
@@ -348,47 +251,69 @@
   padding-right: 6px;
 }
 
+/* END NAVIGATION */
 
 
 /**********************************************************************
 /* Widgets
 /**********************************************************************/
 
+/* STANDARD TAGS -----------------------------------------------------------*/
+/* standard html (body, h1, p, form...) */
 
-/* Various forms of links */
+body {
+  margin:5px 5px 0px 5px;
+  padding:0;
+  font:small/1.5em Tahoma, "Lucida Grande", sans-serif; voice-family: "\"}\""; voice-family:inherit;
+}
 
-.action-list { 
-  padding: 0;
+h1 {
+  font-size: 1.2em;
+  font-weight: bold;
+  color: #666666;
+  margin-bottom: 12px;
 }
 
-.action-list ul { 
-  margin: 0;
-  padding: 0;
-  display: inline;
-  border: none;
+h2 {
+  font-size: 1.1em;
+  font-weight:bold;
+  color: #555555;
+  margin-bottom: 12px;
 }
-                
-.action-list ul li {
-  margin: 0;
-  padding: 0;
-  border: none;
-  list-style: none;
-  display: inline;
+
+h3 {
+  font-size: 1.05em;
+  font-weight:bold;
+  color: #444444;
+  margin-bottom: 12px;
 }
 
-a.refresh {
-  color: white;
-  text-decoration: underline;
+h3 {
+  font-size: 1.00em;
+  font-weight:bold;
+  color: #444444;
+  margin-bottom: 12px;
 }
-a.refresh:hover {
-  color: red;
-  text-decoration: underline;
+
+a:link {
+  color: #235c96;
+  text-decoration:underline;
 }
 
+a:visited {
+  color: #235c96;
+}
+
+a:hover {
+  color: #235c96;
+  background: #CCCCCC;
+}
+
+/* BUTTON ---- */
 a.button { 
-  font: 85% arial;
+  font: .85em arial;
   border: solid 1px black;
-  background-color: #e1e1e1;
+  background-color: #E1E1E1;
   text-align: center; 
   padding: 1px;
   padding-left: 8px;
@@ -397,25 +322,57 @@
   text-decoration: none;
   white-space: nowrap;
 }
+
 a.button:link { 
   text-decoration: none;
   border: solid 1px black;
 }
-a.button:visited { 
-  text-decoration: none;
-  border: solid 1px black;
-}
+
 a.button:hover { 
   text-decoration: none;
-  background-color: #ccc;
+  background-color: #CCCCCC;
   border: solid 1px black;
 }
+
 a.button:active { 
   text-decoration: none;
   border: solid 1px black;
 }
 
+/* END BUTTON ---- */
 
+.center {text-align: center;}
+.small {font-size: x-small;}
+
+/*  ARE THESE NEEDED ??? -----------------------------------------------------------*/
+
+/* Various forms of links */
+
+.action-list { 
+  padding: 0;
+}
+
+.action-list ul { 
+  margin: 0;
+  padding: 0;
+  display: inline;
+  border: none;
+}
+                
+.action-list ul li {
+  margin: 0;
+  padding: 0;
+  border: none;
+  list-style: none;
+  display: inline;
+}
+
+div.subsite-context-bar {
+  font-size: 85%;
+  margin-bottom: 4px;
+  position: relative;
+}
+
 a.admin-button { 
   font: 85% arial;
   border: solid 1px black;
@@ -459,49 +416,72 @@
   background: #f00;
 }
 
+.highlight { 
+  background-color: #ffc; 
+}
 
 ul.action-links li {
   list-style: circle url(/resources/acs-subsite/action-link-marker.png);
   margin: 8px;
   margin-left: -16px;
 }
 
-div.subsite-context-bar {
-  font-size: 85%;
-  margin-bottom: 4px;
-  position: relative;
-}
+/*  END ARE THESE NEEDED -----------------------------------------------------------*/
 
+/* END STANDARD TAGS ---------------------------------------------------------------*/
 
+/* HEADER TAGS ---------------------------------------------------------------------*/
 
-/* Text Styles */
+#header {
+  font-size: 0.92em;
+  background-color: #EFEFEF;
+  color: #444444;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
 
-h1 {
-  font-size: 120%;
-  margin-bottom: 12px;
+#system-name {
+  font-size: 1.4em;
+  font-weight: bold;
+  float: left;
+  padding-left: 0.2em;
 }
-h2 {
-  font-size: 115%;
-  margin-bottom: 12px;
+
+#system-name a {
+  color: #333333;
+  text-decoration: none;
 }
-h3 {
-  font-size: 110%;
-  margin-bottom: 12px;
+
+#header-navigation {
+  float: right;
+  padding-right: 0.4em;
 }
-h4 {
-  font-size: 105%;
-  margin-bottom: 12px;
-}
 
-.small {
-  font-size: 85%;
+/* CONTEXT BAR ---- */
+
+#breadcrumbs {
+  clear: right;
+  padding-left: 100px;
 }
 
-.highlight { 
-  background-color: #ffc; 
+/* END CONTEXT BAR ---- */ 
+
+/* END HEADER TAGS -----------------------------------------------------------*/
+
+/* LISTS -----------------------------------------------------------*/
+
+ul.compact, .action-list ul{
+  margin: 0px;
+  padding: 0px;
 }
+ul.compact li, .action-list ul li {
+  list-style:none;
+  display: inline;
+}
 
+/* END OF LISTS */
 
+
 /* Portlets */
 
 .portlet h2 {
@@ -530,12 +510,6 @@
 }
 
 
-
-
-
-
-
-
 /* Generally Available Tabs */
 
 #tabs-div {
@@ -659,14 +633,6 @@
 }
 
 
-
-
-
-
-
-
-
-
 /**********************************************************************
 /* DEPRECATED CLASSES
 /**********************************************************************/