Prem/Willa Working on the home page

todkar · Jul 25, 2012 · c57a15e · c57a15e
1 parent 412dd57
commit c57a15e
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 17 deletions.
diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -3,11 +3,54 @@ body {
     font-size: 14px;
 }
 
-div{
-    #logo{
-    float:left;
-    color:green;
+#header {
+    padding: 10px;
+    margin: 10px;
+    font-size: 20px;
+
+    #logo {
+        color: #00c800;
+        float: left;
+        font-size: 40px;
+        margin-left: 125px;
+        margin-bottom: 20px;
+    }
+
+    #menu {
+        float: right;
+        ul {
+            list-style-image: none;
+            li {
+                display: inline;
+                padding:5px;
+            }
+        }
+    }
+
+}
+
+#content {
+    background-color: #d3d3d3;
+    margin: 40px 0;
+    padding: 10px;
+
+    #findCreditUnion {
+        margin-top:30px;
+        margin-left:auto;
+        margin-right:auto;
+        background-color: white;
+        position: relative;
+        height: 300px;
+        width: 80%;
     }
 
+    #feed {
+
+    }
+
+    #resources {
+
+    }
+}
+
 
-}
diff --git a/app/views/home/index.scala.html b/app/views/home/index.scala.html
@@ -1,9 +1,17 @@
-@main(title="blablabla"){
+@main(title="Welcome to CreditUnionFindr") {
 
-<h2>
-  Welcome to Credit Union Findr!
-</h2>
 
+<div id="findCreditUnion">
+
+</div>
+
+
+<div id="feed">
+    <h3>twitter feed</h3>
+</div>
+<div id="resources">
+    <h2>other resources</h2>
+</div>
 <div>
   <a href="/maps">Maps</a>
 </div>

diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -5,22 +5,24 @@
     <head>
         <title>@title</title>
         <link rel="stylesheet" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
+        <link rel="stylesheet" media="screen" href="@routes.Assets.at("stylesheets/reset.css")">
 
         <link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
         <script src="@routes.Assets.at("javascripts/jquery-1.7.1.min.js")" type="text/javascript"></script>
     </head>
     <body>
-    <header>
-        <div id='logo'>creditunionﬁndr</div>
-        <div id='menu_bar'>
+    <div id="header">
+        <div id='logo'><h2>creditunionﬁndr</h2></div>
+        <div id='menu'>
             <ul>
-                <li>home</li>
-                <li>about</li>
-                <li>blog</li>
+                <li><a href="/">home</a></li>
+                <li><a href="#">about</a></li>
+                <li><a href="#">blog</a></li>
             </ul>
         </div>
-
-    </header>
+    </div>
+    <div id="content">
     @content
+    </div>
     </body>
 </html>
diff --git a/public/stylesheets/reset.css b/public/stylesheets/reset.css
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+    display: block;
+}
+body {
+    line-height: 1;
+}
+ol, ul {
+    list-style: none;
+}
+blockquote, q {
+    quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+    content: '';
+    content: none;
+}
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}