restyle more to phil's liking

kdavh · Sep 22, 2013 · ba7bb21 · ba7bb21
1 parent 3c80403
commit ba7bb21
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 14 deletions.
diff --git a/app/assets/images/phil1_960.jpg b/app/assets/images/phil1_960.jpg
diff --git a/app/assets/javascripts/templates/home.hbs.erb b/app/assets/javascripts/templates/home.hbs.erb
@@ -1,8 +1,19 @@
 <div class="row">
-  <div class="large-5 small-5 columns">
-    <img id="welcome-pic" src="<%= image_path('phil1_300.jpg') %>">
-  </div>
-  <div class="large-5 small-5 columns">
-    <p><%= "about phil info text here<br>more great stuff about him<br><br>wow, it just keeps going.".html_safe %> </p>
+  <div class="large-12 small-12 columns">
+    <div id="home-content">
+      <ul>
+        <li>
+          {{#linkTo "songs.index"}}music{{/linkTo}}
+          <ul>
+            <li>album 1 name</li>
+            <li>album 2 name</li>
+          </ul>
+        </li>
+        <li>bandcamp</li>
+        <li>hobbit homes</li>
+        <li>judo championships</li>
+        <li>contact</li>
+      </ul>
+    </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/templates/songs.hbs.erb b/app/assets/javascripts/templates/songs.hbs.erb
@@ -1,17 +1,24 @@
 <div class="row">
   <div class="large-12 columns">
     <div class="center-image panel">
-      <%= image_tag "gig1_960.jpg" %>
+      <div class="image">
+        <ul>
+          <li>{{#linkTo "songs.index"}}songs{{/linkTo}}</li>
+          <li>albums</li>
+          <li><a href="http://philhart.bandcamp.com/" target="_blank">bandcamp</a></li>
+        </ul>
+      </div>
     </div>
   </div>
 </div>
 <div class="row">
   <div class="large-4 columns">
     <div class="panel">
-      <ul class="side-nav">
+      <h4>Songs</h4>
+      <ul>
         {{#each}}
           {{#linkTo "song" this}}
-            <li>{{name}}</li>
+            <li>{{name}}<i class="icon-caret-right right"></i></li>
           {{/linkTo}}
         {{/each}}
       </ul>

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
@@ -22,12 +22,20 @@ $secondary-color: #fefefe;
 
 // handlebars css
 
+
+ul {
+  list-style-type: none;
+}
 // .active is auto added to any active linkTo
 .top-bar-section ul li > a.active {
   color: black;
   background-color: #ccc;
 }
 
+.title-area .name h1 a {
+  font-family: 'Copperplate Gothic Bold';
+}
+
 
 // custom css
 
@@ -40,13 +48,34 @@ nav.top-bar i {
   //make space for header
   margin-top: 70px;
 }
-.panel.center-image {
+.center-image {
   background-color: #C6D0D8;
   border-color: #99B1C3;
-  img {
-    -webkit-box-shadow: 0 0 5px #999;
-    -moz-box-shadow: 0 0 5px #999;
-    box-shadow: 0 0 5px #999;
-    border-color: #999;
+  .image {
+    background: image-url("gig1_960.jpg") no-repeat 0 0;
+    height:422px;
+    padding-top: 15px;
+    padding-left: 30px;
+  }
+  ul {
+    font-size: 25px;
+  }
+}
+
+#home-content {
+  background-image: image-url('phil1_960.jpg');
+  background-repeat: no-repeat;
+  background-position: top right;
+  height: 1166px;
+  color: #fff;
+  padding-top: 200px;
+  padding-left: 100px;
+  font-size: 40px;
+  ul {
+    list-style-type: none;
+  }
+  a {
+    color: white;
+    &:hover { color: #2795b6;}
   }
 }