Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

some changes for chris

  • Loading branch information...
commit 56c3fcfeffc4afb035ae8d85f41303db3389a1be 1 parent 82e833d
Andrew Glass authored
View
3  app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -29,3 +29,6 @@
//
// Example:
// @linkColor: #ff0000;
+
+
+@import "compass/css3/gradient"
View
13 app/assets/stylesheets/welcome.css.scss
@@ -3,12 +3,21 @@
// You can use Sass (SCSS) here: http://sass-lang.com/
+// body {background-color: #C1DAD6;}
+
+
+
+
+body {background-color: #C1DAD6;}
+// body {background-image: -radial-gradient(color-stops(#c00, #fff, #00c 50px));}
+
+
#whale-container { display: block; float: left; margin: 6% 0 0 6%; }
-#song-container { display: block; float: left; margin: 10% 0 50px 12px;}
+#song-container { display: block; float: left; margin: 6% 0 50px 12px;}
#whale-img { max-width: 450px; width: 100%;}
-#album { max-height: 75px; margin: 20px auto 50px auto; display: block;}
+#album { max-height: 120px; margin: 20px 0 20px 25px; display: block;}
#songs { list-style-type: none; float: left;}
View
11 app/views/welcome/index.html.erb
@@ -1,4 +1,3 @@
-<%= link_to "Download", "/assets/six.mp3", :target => "blank" %>
<div id="container row-fluid show-grid">
<div id="whale-container" class="span5">
<%= image_tag "whale.png", :id => "whale-img" %>
@@ -57,13 +56,9 @@
</li>
</ul>
</div>
- <div id="footer">
- <%= image_tag "credits.png", :id =>"credits" %>
- </div>
+<!-- <div id="footer">
+ <%#= image_tag "credits.png", :id =>"credits" %>
+ </div> -->
</div>
<audio id="player" class="mp3player" width="300" height="32" src="" controls="controls" data-current="" preload="auto" autoplay="false" autobuffer=""></audio>
-
-<!-- <button onclick="document.getElementById('player').play()">Play</button>
- -->
-<%#= link_to 'https://s3.amazonaws.com/personalsitesongs/03+Tribulations.mp3', :action => :download %>

0 comments on commit 56c3fcf

Please sign in to comment.
Something went wrong with that request. Please try again.