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.2.4 -r1.27.2.5
--- openacs-4/packages/acs-subsite/www/resources/site-master.css	27 Mar 2007 09:02:13 -0000	1.27.2.4
+++ openacs-4/packages/acs-subsite/www/resources/site-master.css	1 Apr 2007 05:53:11 -0000	1.27.2.5
@@ -1,109 +1,44 @@
 /* Styles originally defined in default-master.css */
 
 #login-box {
-    border: black 1px solid;
-    padding: 4px;
+  border: black 1px solid;
+  padding: 4px;
 }
 
 TABLE.table-display {
-    font-family: tahoma, verdana, helvetica; 
-    font-size: 85%;
+  font-family: tahoma, verdana, helvetica; 
+  font-size: 85%;
 }
 
 TR.table-header {
-    background-color: #cccccc; 
+  background-color: #cccccc; 
 }
 
 TR.even {
-    background-color: #f0f0f0;
+  background-color: #f0f0f0;
 }
 
 TR.odd {
-    background-color: #e0e0e0;
+  background-color: #e0e0e0;
 }
 
 /* Replace deprecated center tags in forms. Eventually all forms should use form builder and this tag should not be used */
 
 DIV.submit-button {
-	text-align: center;
+  text-align: center;
 }
 
 
 /**********************************************************************
 /* Site-Wide/Master Templates
 /**********************************************************************/
 
-/* BODY tag */
-
-body {
-  font-family: verdana, helvetica, arial, sans-serif;
-  background-color: white;
-  margin: 0px;
-}
-
 #skiptocontent {
   display: none;
 }
 
-.block-marker {
-  display: none;
-}
+.block-marker {display: none;}
 
-/* Site Header */
-
-#header {
-  background-color: #313063; 
-  color: white;
-  font-family: tahoma, verdana, helvetica, sans-serif;
-  font-size: 85%;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  padding-left: 8px;
-  padding-right: 8px;
-  text-align: center;
-}
-
-#system-name {
-  font-size: 120%;
-  font-weight: bold;
-  float: left;
-}
-#system-name a {
-  color: white;
-  text-decoration: none;
-}
-#system-name a:hover {
-  color: white;
-  text-decoration: none;
-}
-
-#header-navigation {
-    float: right;
-    display:inline;
-    padding-right: 0.4em;
-}
-
-#header-navigation li {
-  display: inline;
-}
-
-#header-navigation a { 
-  border: solid 1px #313063;
-  text-align: center; 
-  padding: 1px;
-  padding-left: 4px;
-  padding-right: 4px;
-  color: white;
-  text-decoration: none;
-}
-#header-navigation a:hover { 
-  text-decoration: none;
-  background-color: #666666;
-  border: solid 1px #999999;
-}
-
-
-
 /* User Messages */
 
 #alert-message {
@@ -143,22 +78,6 @@
 }
 
 
-/* Context Bar */
-
-#breadcrumb .compact {
-  margin-left: 0;
-  padding-left: 0;
-  border: none;
-} 
-#breadcrumb .compact li {
-  margin-left: 0;
-  padding-left: 2px;
-  border: none;
-  list-style: none;
-  display: inline;
-}
-
-
 /* Subsite Name */
 
 #subsite-name { 
@@ -320,7 +239,6 @@
   color: black;
 }
 
-
 #subnavbar-body { 
   border-bottom: 1px solid #016799;
   border-left: 1px solid #016799;
@@ -333,47 +251,71 @@
   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:none;
 }
 
+a:visited {
+  color: #235c96;
+  text-decoration:none;
+}
+
+a:hover {
+  color: #235c96;
+  text-decoration:underline;
+  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;
@@ -382,25 +324,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;
@@ -444,49 +418,79 @@
   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;
+#header a {
+  color: #444444;
+  padding: 1px;
+  padding-left: 4px;
+  padding-right: 4px;
+  text-decoration: none;
 }
-h2 {
-  font-size: 115%;
-  margin-bottom: 12px;
+
+#header a:visited {
+  color: #444444;
+  text-decoration:none;
 }
-h3 {
-  font-size: 110%;
-  margin-bottom: 12px;
+
+#header a:hover {
+  color: #444444;
+  text-decoration:underline;
 }
-h4 {
-  font-size: 105%;
-  margin-bottom: 12px;
+
+#system-name {
+  font-size: 1.4em;
+  font-weight: bold;
+  float: left;
 }
 
-.small {
-  font-size: 85%;
+#header-navigation {
+  float: right;
+  display:inline;
+  padding-right: 0.4em;
 }
 
-.highlight { 
-  background-color: #ffc; 
+#header-navigation li {
+  display: inline;
 }
 
+/* CONTEXT BAR ---- */
 
+#breadcrumbs {
+  padding-left: 100px
+}
+
+#breadcrumbs .compact li {
+  display: inline;
+}
+
+/* END CONTEXT BAR ---- */ 
+
+/* END HEADER TAGS -----------------------------------------------------------*/
+
+
 /* Portlets */
 
 .portlet h2 {
@@ -515,12 +519,6 @@
 }
 
 
-
-
-
-
-
-
 /* Generally Available Tabs */
 
 #tabs-div {
@@ -644,14 +642,6 @@
 }
 
 
-
-
-
-
-
-
-
-
 /**********************************************************************
 /* DEPRECATED CLASSES
 /**********************************************************************/