From: Date: Fri, 31 Aug 2007 12:43:50 +0000 (-0400) Subject: * Fixed fonts. X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/da120efeaaffe20027a494ac59ba31f70d236f07?ds=sidebyside;hp=190929f3392f3e433488f3132f88f3a179aee461 * Fixed fonts. * Added login and logout to front page. --- diff --git a/app/views/layouts/frontpage.rhtml b/app/views/layouts/frontpage.rhtml index 8f14c3a..6531dc4 100644 --- a/app/views/layouts/frontpage.rhtml +++ b/app/views/layouts/frontpage.rhtml @@ -11,6 +11,11 @@
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 9e2f7b5..e0e34a2 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,4 +1,3 @@ -<% %>

Voters

diff --git a/public/images/title_front.png b/public/images/title_front.png index acf328f..d249a69 100644 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 f3dd02d..1fe60dd 100644 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 42390e3..a050444 100644 --- 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 5c2d1ca..4c973b1 100644 --- 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;