committed css changes from courtland fixing some headerbar wonkiness

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 94081e6389490df425db021ebb6cf8866c309380..c05424e119bfac8b521e12eb8cd87c4916230c96 100644 (file)
--- 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>
        <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>
 </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">
 <%= 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>
 
   </div>
   <div class="clear-div"></div>
 

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index e13ea942a45a7e175e6b0120efc0bec7741d04f1..856d74e154e3d2b0cd1bdca6159738e40dc8fdaf 100644 (file)
--- 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>
        <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 c45fd2a5f147478a0edabd86f16b79908adc2163..eb149f605cca0ec68c9d403a18532b689daa9843 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,6 +1,6 @@
 <% require 'whois/whois' %>
 
 <% require 'whois/whois' %>
 

-<div id="page-title">
+<div id="title-header">

   <span class="header">Quickvote</span>
   <span class="subheader">Results</span>
 </div>
   <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>
 
      <%= @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>
   <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>
 
            :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>
   <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 428a3f295ed3140f3b31ca3b89671ef35e236651..59e51f30bad1f559208257248f288001fd42d022 100644 (file)
--- 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>
        <span class="header">Quickvote</span>
        <span class="subheader">New QuickVote Created</span>

-       <div style="clear:both;"></div>

 </div>
 
 <p>Please direct voters to:</p>
 </div>
 
 <p>Please direct voters to:</p>

diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml
index b57ac0b2a3abcd42bcb84798b577b1e421483729..bf98ef89ec1619e37b075dcece0ff6d29dbc5976 100644 (file)
--- 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>
   <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 9139066b58a101c28f0074e1f7a247425fe343ef..01cd7c052e53363d8dffd1468d9fbc4511deb55a 100644 (file)
--- 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;
 }
 
        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;
 /* tables still need 'cellspacing="0"' in the markup */
 table {
        border-collapse: separate;


@@ -71,7 +76,7 @@ h2, h3 {
 
 #footer {
        font-size: 11px;
 
 #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;
 }
        margin-top: 40px;
        text-align: center;
 }

diff --git a/public/stylesheets/election.css b/public/stylesheets/election.css
index 3e34a452c83e1438f4de6bfa96bc40d5c870ca1f..dce594f6b941f27d7933ae21508b9a0b2265ee1d 100644 (file)
--- a/public/stylesheets/election.css
+++ b/public/stylesheets/election.css
@@ -2,11 +2,15 @@ a {
        color: #dc0d13;
 }
 
        color: #dc0d13;
 }
 

-#page-title .header {
+#title-header {
+    background-color: #dc0d13;
+}
+
+#title-header .header {

        background-color: #dc0d13;
 }
 
        background-color: #dc0d13;
 }
 

-#page-title .subheader {
+#title-header .subheader {

        color: #dc0d13;
        background-color: #e5e5e5;
 }
        color: #dc0d13;
        background-color: #e5e5e5;
 }

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index acdff30b59a552c68e5708f4536dc9ea246e937a..3608063a4ae355fe2e331e1ea2a10359fe25edb4 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -152,40 +152,41 @@ h5 {
        overflow: hidden;
 }
 
        overflow: hidden;
 }
 

-#page-title {
+#title-header {

     margin: -20px -20px 1em -20px;
     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 {
 }
 
 .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 {
 }
 
 .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;
 
 #main-box {
        float: right;

diff --git a/public/stylesheets/quickvote.css b/public/stylesheets/quickvote.css
index d400dcfd4345972e2b5283e5fec1777ca6a00e0b..b18da44ee55495cdc796762e62e0f2fbd0ea6865 100644 (file)
--- a/public/stylesheets/quickvote.css
+++ b/public/stylesheets/quickvote.css
@@ -2,11 +2,10 @@ a {
        color: #569a00;
 }
 
        color: #569a00;
 }
 

-#page-title .header {
+#title-header .header {

        background-color: #74ce00;
 }
 
        background-color: #74ce00;
 }
 

-#page-title .subheader {
+#title-header .subheader {

        color: #74ce00;
        color: #74ce00;

-       background-color: #e5e5e5;

 }
 }

diff --git a/public/stylesheets/voter.css b/public/stylesheets/voter.css
index ec14c847e48c6f4f55b198ed9964c643c2306ebe..8f5c734a97893e760a79d281a1ad6c849440242f 100644 (file)
--- a/public/stylesheets/voter.css
+++ b/public/stylesheets/voter.css
@@ -2,11 +2,15 @@ a {
     color: #005cd9;
 }
 
     color: #005cd9;
 }
 

-#page-title .header {
+#title-header {

        background-color: #005cd9;
 }
 
        background-color: #005cd9;
 }
 

-#page-title .subheader {
+#title-header .header {
+       background-color: #005cd9;
+}
+
+#title-header .subheader {

        color: #005cd9;
        background-color: #e5e5e5;
 }
        color: #005cd9;
        background-color: #e5e5e5;
 }