3 files changed, 32 insertions, 20 deletions

diff --git a/app/views/custom/page_templates/public/no_date_and_author.html.erb b/app/views/custom/page_templates/public/no_date_and_author.html.erb
index ef609612..b0198057 100644
--- a/app/views/custom/page_templates/public/no_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_date_and_author.html.erb
@@ -1,7 +1,6 @@
 <div class="article">
-  <h2><%= @page.title %></h2>
-  <hr class="subtitle" />
-  <p><em><%= sanitize( @page.abstract ) %></em></p>
+  <h2 class="headline"><%= @page.title %></h2>
+  <p><%= sanitize( @page.abstract ) %></p>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb
index 8cd88a68..5ea277ad 100644
--- a/app/views/custom/page_templates/public/standard_template.html.erb
+++ b/app/views/custom/page_templates/public/standard_template.html.erb
@@ -1,8 +1,7 @@
 <div class="article">
-  <h2><%= @page.title %></h2>
-  <h3><%= date_for_page @page %>, <%= @page.user.try(:login) %></h3>
-  <hr class="subtitle" />
-  <div class="abstract"><p><em><%= sanitize( @page.abstract )%></em></p></div>
+  <h2 class="headline"><%= @page.title %></h2>
+  <div class="author_and_date"><%= date_for_page @page %>, <%= @page.user.try(:login) %></div>
+  <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
   <div id="headline_image"><%= headline_image %></div>
   <div class="body"><%= aggregate?(@page.body) %></div>
 </div>
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index 84fa0de5..c12ad8bb 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -1,8 +1,9 @@
 body {
+  background-color: #FFFFFF;
   margin: 0;
   padding: 0;
   text-align: center;
-  font-family: Verdana, sans-serif;
+  font-family: Verdana, Helvetica, Arial, sans-serif;
   font-size: 11px;
   line-height: 16px;
   background-color: #ffffff;
@@ -10,21 +11,22 @@ body {
 }
 
 h2 {
-  font-size: 16px;
+  font-size: 15px;
   line-height: 22px;
   font-family: Helvetica;
 }
 
 a {
-  color: #000000;
+  color: #535353;
+  text-decoration: underline;
 }
 
 a:visited {
-  color: #000000;
+  color: #535353;
 }
 
 a:hover {
-  color: #ff9600;
+  color: #535353;
 }
 
 pre {
@@ -46,9 +48,12 @@ div#header img {
   border: none;
 }
 
+/*------------------main-navigation-------------------*/
+
 div.main_navigation ul {
   margin-left: 0;
   padding-left: 0;
+  line-height: 18px;
 }
 
 div.main_navigation li {
@@ -60,27 +65,31 @@ div.main_navigation a {
   font-size: 14px;
 }
 
-div.main_navigation a:hover {
-  color: #535353;
+div.main_navigation a.inactive:hover {
+  color: #F8921E;
 }
 
 div.main_navigation a.active {
-  color: #535353;
-  text-decoration: underline;
+  color: #000000;
+  text-decoration: none;
   text-transform: lowercase;
-  font-size: 14px;
+  font-size: 13px;
 }
 
 div.main_navigation a.inactive {
-  color: #535353;
+  color: #CCCCCC;
   text-transform: lowercase;
-  font-size: 14px;
+  font-size: 13px;
 }
 
+/*------------------calendar-featured-tags-------------------*/
+
 div#frontpage_calendar {
+  margin-top: 30px;
 }
 
 div#frontpage_calendar h2, div#tags h2, div#featured_articles h2 {
+  color: #CCCCCC;
   border-top: 2px solid #CCCCCC;
   border-bottom: 2px solid #CCCCCC;
   font-size: 16px;
@@ -113,6 +122,7 @@ div#featured_articles li a:hover {
   color: #ff9600;
 }
 
+/*--------------------------------------------------------------*/
 
 div.author_and_date {
   font-style: italic;
@@ -148,6 +158,10 @@ div#center_column h2 a {
   color: #535353;
 }
 
+div#center_column h2 a:hover {
+  color: #8e8e8e;
+}
+
 div#center_column h2.headline {
   margin-top: 8px;
   border-bottom: 2px solid #cccccc;
@@ -158,7 +172,7 @@ div#right_column {
   background-color: #ffffff;
   padding-left: 70px;
   left: 675px;
-  width: 145px; 
+  width: 155px; 
   height: 100px;
 }