From c49bd887561c4ee07feef7e6e8d25b6a3f15b5b7 Mon Sep 17 00:00:00 2001
From:  <mako@atdot.cc>
Date: Thu, 30 Aug 2007 18:52:53 -0400
Subject: [PATCH] committed css changes from courtland fixing some headerbar
 wonkiness

---
 app/views/quickvote/create.rhtml  |  9 +++---
 app/views/quickvote/index.rhtml   |  2 +-
 app/views/quickvote/results.rhtml |  6 ++--
 app/views/quickvote/success.rhtml |  3 +-
 app/views/quickvote/thanks.rhtml  |  2 +-
 public/stylesheets/common.css     |  7 ++++-
 public/stylesheets/election.css   |  8 +++--
 public/stylesheets/main.css       | 51 ++++++++++++++++---------------
 public/stylesheets/quickvote.css  |  5 ++-
 public/stylesheets/voter.css      |  8 +++--
 10 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 94081e6..c05424e 100644
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,7 +1,6 @@
-<div id="page-title">
+<div id="title-header">
 	<span class="header">Quickvote</span>
 	<span class="subheader">Create New QuickVote</span>
-	<div style="clear:both;"></div>
 </div>
 
 <p><label for="quickvote_candidate_names">Choices</p>
@@ -26,9 +25,9 @@
 <%= text_field 'quickvote', 'description', :size => 50 %></p>
 
 <div id="advanced" style="display: none">
-  <div class="plain-header">
-  <span class="header">Advanced Options</span>
-  <span class="subheader"></span>
+  <div class="normal-header">
+    <span class="header">Advanced Options</span>
+    <span class="subheader"></span>
   </div>
   <div class="clear-div"></div>
 
diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index e13ea94..856d74e 100644
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,4 +1,4 @@
-<div id="page-title">
+<div id="title-header">
 	<span class="header">Quickvote</span>
 	<span class="subheader"><%=h @voter.election.description.capitalize %></span>
 </div>
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index c45fd2a..eb149f6 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,6 +1,6 @@
 <% require 'whois/whois' %>
 
-<div id="page-title">
+<div id="title-header">
   <span class="header">Quickvote</span>
   <span class="subheader">Results</span>
 </div>
@@ -28,7 +28,7 @@
      <%= @election.voters.reject {|v| not v.voted? }.length %> (see below for details) 
    </blockquote>
 
-<div class="plain-header">
+<div class="normal-header">
   <span class="header">Winner</span>
   <span class="subheader">The chosen method is: 
   <%= @election.election_method.capitalize %></span>
@@ -39,7 +39,7 @@
            :object => @results[@election.election_method] %>
 </div>
 
-<div class="plain-header">
+<div class="normal-header">
   <span class="header">Other Voting Methods</span>
   <span class="subheader"></span>
 </div>
diff --git a/app/views/quickvote/success.rhtml b/app/views/quickvote/success.rhtml
index 428a3f2..59e51f3 100644
--- a/app/views/quickvote/success.rhtml
+++ b/app/views/quickvote/success.rhtml
@@ -1,7 +1,6 @@
-<div id="page-title">
+<div id="title-header">
 	<span class="header">Quickvote</span>
 	<span class="subheader">New QuickVote Created</span>
-	<div style="clear:both;"></div>
 </div>
 
 <p>Please direct voters to:</p>
diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml
index b57ac0b..bf98ef8 100644
--- a/app/views/quickvote/thanks.rhtml
+++ b/app/views/quickvote/thanks.rhtml
@@ -1,4 +1,4 @@
-<div id="page-title">
+<div id="title-header">
   <span class="header">Quickvote</span>
   <span class="subheader">Vote Recorded Successfully</span>
 </div>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 9139066..01cd7c0 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -28,6 +28,11 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	vertical-align: baseline;
 }
 
+body {
+	font-size: 11px;
+	font-family: Trebuchet, Verdana, Arial, Helvetica, sans-serif;
+}
+
 /* tables still need 'cellspacing="0"' in the markup */
 table {
 	border-collapse: separate;
@@ -71,7 +76,7 @@ h2, h3 {
 
 #footer {
 	font-size: 11px;
-	font-family: "Trebuchet MS", Trebuchet, Verdana, Arial, Helvetica, sans-serif;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
 	margin-top: 40px;
 	text-align: center;
 }
diff --git a/public/stylesheets/election.css b/public/stylesheets/election.css
index 3e34a45..dce594f 100644
--- a/public/stylesheets/election.css
+++ b/public/stylesheets/election.css
@@ -2,11 +2,15 @@ a {
 	color: #dc0d13;
 }
 
-#page-title .header {
+#title-header {
+    background-color: #dc0d13;
+}
+
+#title-header .header {
 	background-color: #dc0d13;
 }
 
-#page-title .subheader {
+#title-header .subheader {
 	color: #dc0d13;
 	background-color: #e5e5e5;
 }
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index acdff30..3608063 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -152,40 +152,41 @@ h5 {
 	overflow: hidden;
 }
 
-#page-title {
+#title-header {
     margin: -20px -20px 1em -20px;
+    height: 32px;
+    margin-bottom: 14px;
+	background-color: #e5e5e5;
 }
 
-.plain-header {
-    margin: 1em -20px 1em -20px;
+.normal-header {
+    margin: 0 -20px 1em -20px;
+    height: 32px;
+	background-color: #e5e5e5;
 }
 
 .header {
-	display: block;
-	font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
-	font-size: 30px;
-	text-transform: uppercase;
-	text-align: center;
-	color: white;
-	background-color: #999999;
-	height: 32px;
-	float: left;
-	padding: 0px .75em 0px .75em;
-	margin-right: 10px;
-	margin-bottom: 14px;
+    display: block;
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 30px;
+    text-transform: uppercase;
+    text-align: center;
+    color: white;
+    background-color: #999999;
+    height: 32px;
+    float: left;
+    padding: 0px .75em 0px .75em;
 }
 
 .subheader {
-	display: block;
-	font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
-	font-size: 18px;
-	text-align: left;
-	color: #666666;
-	background-color: #CCCCCC;
-	height: 26px;
-	padding: 6px 1em 0px 20px;
-	margin-bottom: 14px;
-}
+    float: left;
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 18px;
+    color: #666666;
+	background-color: #e5e5e5;
+    height: 26px;
+    padding: 6px 1em 0px 10px;
+} 
 
 #main-box {
 	float: right;
diff --git a/public/stylesheets/quickvote.css b/public/stylesheets/quickvote.css
index d400dcf..b18da44 100644
--- a/public/stylesheets/quickvote.css
+++ b/public/stylesheets/quickvote.css
@@ -2,11 +2,10 @@ a {
 	color: #569a00;
 }
 
-#page-title .header {
+#title-header .header {
 	background-color: #74ce00;
 }
 
-#page-title .subheader {
+#title-header .subheader {
 	color: #74ce00;
-	background-color: #e5e5e5;
 }
diff --git a/public/stylesheets/voter.css b/public/stylesheets/voter.css
index ec14c84..8f5c734 100644
--- a/public/stylesheets/voter.css
+++ b/public/stylesheets/voter.css
@@ -2,11 +2,15 @@ a {
     color: #005cd9;
 }
 
-#page-title .header {
+#title-header {
 	background-color: #005cd9;
 }
 
-#page-title .subheader {
+#title-header .header {
+	background-color: #005cd9;
+}
+
+#title-header .subheader {
 	color: #005cd9;
 	background-color: #e5e5e5;
 }
-- 
2.30.2