* Fixed fonts.

* Added login and logout to front page.

diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml
index 8f14c3ae32c014fce8213e22a4698978b27552ac..6531dc47bd9df4819177645ee3ac750d8f4ecb42 100644 (file)
--- a/app/views/layouts/frontpage.rhtml
+++ b/app/views/layouts/frontpage.rhtml
@@ -11,6 +11,11 @@
     <div id="page-wrapper">
 
     <div id="header">
+      <div id="top-bar">
+        <a href="/account/login">login</a>
+          &nbsp;&nbsp;&nbsp;<a href="/account/signup">sign up</a>
+          &nbsp;&nbsp;&nbsp;<a href="/site/about">help/about</a>
+      </div>
          <a href="index.html"><h1>selectricity: voting machinery for the masses</h1></a>
     </div>
   

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 9e2f7b51a3ab78a0213e0650ff457614da656706..e0e34a278475fbdf1f49b97a26f972d0c2f75a57 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,4 +1,3 @@
-<% %>
 <div id="voters" class="main-section">
   <div id="voters-content">
   <h2>Voters</h2>

diff --git a/public/images/title_front.png b/public/images/title_front.png
index acf328fff3c5e18456f845235bf81cfbc2c31127..d249a69e157f2992989a4b6efa047de15b58ae53 100644 (file)
Binary files a/public/images/title_front.png and b/public/images/title_front.png differ

diff --git a/public/images/title_main.png b/public/images/title_main.png
index f3dd02d2b159a6ed5f40b291b3377608f73da8a5..1fe60dd97341bd14687ddf91cad9e41ed6bb462f 100644 (file)
Binary files a/public/images/title_main.png and b/public/images/title_main.png differ

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 42390e32436a7021a9af457d1ca621d6b15bdcca..a050444f3327d328062db58e2e93e20d9e02290b 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -76,7 +76,7 @@ h2, h3 {
 
 #footer {
        font-size: 11px;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Trebuchet MS", Trebuchet, Verdana, Arial, sans-serif;
        margin-top: 40px;
        text-align: center;
 }
@@ -104,7 +104,4 @@ h2, h3 {
     background: #FFFBB3; 
     border: 1px black solid;
        text-align: center;
-       font-weight: bold;
-       padding: 5px 5px 5px 15px;
-    width: 250px;
-}
+       font-weight: bold

diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css
index 5c2d1cab2a04b7f1af26e67f48146edd33a592c2..4c973b125a097ee5cf45a4fafb867cf5fcf3d853 100644 (file)
--- a/public/stylesheets/front.css
+++ b/public/stylesheets/front.css
@@ -18,7 +18,7 @@ table, caption, tbody, tfoot, thead, tr, th, td {
        padding: 0;
        border: 0;
        font-size: 100%; 
-       font-family: inherit;
+       font-family: "Trebuchet MS", Verdana, Arial, sans-serif;
        vertical-align: baseline;
 }
 
@@ -33,7 +33,7 @@ a {
 }
 
 #body {
-       font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Trebuchet MS", Verdana, Arial, sans-serif;
        color: white;
        font-size: 12px;
        text-align: left;
@@ -58,6 +58,21 @@ a {
        padding-top: 189px;
        height: 0px;
        margin-top: 10px;
+       margin-left: 231px;
+}
+
+#top-bar {
+       
+       position: relative;
+       float: right;
+       width: 231px;
+       text-align: center;
+}
+
+#top-bar a {
+       color: black;
+       font-size: 11px;
+       text-decoration: none;
 }
 
 
@@ -91,6 +106,7 @@ h3 {
     margin-bottom: 1em;
 }
 
+
 #voters {
        padding-top: 50px;
        height: 559px;