Merge remote branch 'remotes/deployment/master' into live

[selectricity] / public / stylesheets / front.css

diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css
index b206834c0d0599fb0865b70f13c58c803a79aaf0..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;
@@ -42,7 +42,7 @@ a {
 
 #body a {
        text-decoration: underline;
-       color: inherit;
+       color: white;
        display: inline;
        opacity: 0.8;
 }
@@ -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;
 }
 
 
@@ -80,8 +95,8 @@ h3 {
 
 .main-section {
        float: left;
-       padding-left: 120px;
-       padding-right: 15px;
+       padding-left: 115px;
+       padding-right: 0px;
 }
 
 .main-section p {
@@ -91,6 +106,7 @@ h3 {
     margin-bottom: 1em;
 }
 
+
 #voters {
        padding-top: 50px;
        height: 559px;