Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed up some css. trying new mp3 player

  • Loading branch information...
commit e05a544d9e445a6020c21a6cc7db547511f29d69 1 parent 62af51f
andy authored Andrew Glass committed
View
35 app/assets/stylesheets/welcome.css.scss
@@ -10,19 +10,38 @@ html {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7cd6c5', endColorstr='#cbd8d6',GradientType=0 ); /* IE6-9 */
}
-#whale-container { display: block; float: left; width: 50%; height: 100%; margin: 6% 0 0 6%; }
-#song-container { display: block; float: left; width: 40%; height: 100%; margin: 14% 0 0px 0px;}
+#whale-container { display: block; float: left; width: 25%; height: 100%; margin: 6% 0 0 6%; }
+#song-container { display: block; float: left; width: 65%; height: 100%; margin: 14% 0 0px 0px;}
#whale-img { width: 100%;}
-#album { max-height: 120px; margin: 20px 0 20px 25px; display: block;}
+#album { max-height: 148px; margin: 20px 0 20px 5px; display: block;}
-#songs { list-style-type: none; float: left;}
+.song-images {display: block;}
-.songname { max-height: 55px; width: 70%; margin-left: 10px; display: inline-block;}
-.play { height: 55px; display: inline-block;}
-.download { height: 55px; display: inline-block;}
+.play { height: 55px;}
+.download { height: 55px;}
+.songname { }
+
+.frog { height: 60px; margin-left: 8px;}
+.selfish { height: 65px; }
+.reco { height: 65px; }
+.formal { height: 60px; }
#credits { width: 70%; margin-left: auto; margin-right: auto; display: block;}
-.mp3player { display: none;}
+.mp3player { display: none;}
+
+/*.songname1 {
+height: 70px;
+margin-left: 14px;
+}
+.songname2 {
+height: 61px;
+}
+.songname3 {
+height: 63px;
+}
+.songname4 {
+height: 56px;
+}*/
View
28 app/views/welcome/index.html.erb
@@ -6,41 +6,40 @@
<div id="song-container" >
<%= image_tag "album.png", :id => "album" %>
- <ul id="songs">
- <li>
+ <div class="song-images">
<%= link_to image_tag("play_button_black.png", :class => "play", :id => "1"),
"#", :class => "song", :data => {:track => "1",
:song => "/assets/songs/Frog_Pie.mp3"} %>
<%= link_to image_tag("download.png", :class => "download"), {:controller => "welcome", :action => "download", :song_name => "Frog_Pie" }%>
- <%= link_to image_tag("frog_pie.png", :class => "songname", :id => "1"),
+ <%= link_to image_tag("frog_pie.png", :class => "songname frog", :id => "1"),
"#", :class => "song", :data => {:track => "1",
:song => "/assets/songs/Frog_Pie.mp3"} %>
- </li>
- <li>
+ </div>
+ <div class="song-images">
<%= link_to image_tag("play_button_black.png", :class => "play", :id => "2"),
"#", :class => "song", :data => {:track => "2",
:song => "/assets/songs/I_Know_This_Is_Selfish_But.mp3"} %>
<%= link_to image_tag("download.png", :class => "download"), {:controller => "welcome", :action => "download", :song_name => "I_Know_This_Is_Selfish_But" }%>
- <%= link_to image_tag("selfish.png", :class => "songname", :id => "2"),
+ <%= link_to image_tag("selfish.png", :class => "songname selfish", :id => "2"),
"#", :class => "song", :data => {:track => "2",
:song => "/assets/songs/I_Know_This_Is_Selfish_But.mp3"} %>
- </li>
- <li>
+ </div>
+ <div class="song-images">
<%= link_to image_tag("play_button_black.png", :class => "play", :id => "3"),
"#", :class => "song", :data => {:track => "3",
:song => "/assets/songs/Your_Recollection_Not_Mine.mp3"} %>
<%= link_to image_tag("download.png", :class => "download"), {:controller => "welcome", :action => "download", :song_name => "Your_Recollection_Not_Mine" }%>
- <%= link_to image_tag("recollection.png", :class => "songname", :id => "3"),
+ <%= link_to image_tag("recollection.png", :class => "songname reco", :id => "3"),
"#", :class => "song", :data => {:track => "3",
:song => "/assets/songs/Your_Recollection_Not_Mine.mp3"} %>
- </li>
- <li>
+ </div>
+ <div class="song-images">
<%= link_to image_tag("play_button_black.png", :class => "play", :id => "4"),
"#", :class => "song", :data => {
:track => "4",
@@ -48,14 +47,13 @@
<%= link_to image_tag("download.png", :class => "download"), {:controller => "welcome", :action => "download", :song_name => "Formal_Leftovers" }%>
- <%= link_to image_tag("formal_leftovers.png", :class => "songname", :id => "4"),
+ <%= link_to image_tag("formal_leftovers.png", :class => "songname formal", :id => "4"),
"#", :class => "song", :data => {
:track => "4",
:song => "/assets/songs/Formal_Leftovers.mp3",
:title => "Phoney Phranchise"} %>
- </li>
- </ul>
+ </div>
</div>
</div>
- <audio id="player" class="mp3player" width="300" height="32" src="" controls="controls" data-current="" autobuffer=""></audio>
+ <audio id="player" class="mp3player" type="audio/mpeg" width="300" height="32" src="" controls="controls" data-current="" autobuffer=""></audio>
Please sign in to comment.
Something went wrong with that request. Please try again.