localhots/oldhaven
1
0
Fork 0
Code Releases Activity

Fuck, missed some files

Browse Source
This commit is contained in:
magnolia-fan 2011-04-16 13:06:23 +04:00
parent 40a51c2c51
commit 3a90336e7c
4 changed files with 92 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/layouts/application.html.erb
View File

@ -9,8 +9,13 @@
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
</head> </head>
<body> <body>
<div id="contents"> <div id="nav">
<div class="inner-1"> <ul>
<li><a href="/">Search</a></li>
<li><a href="/user/profile">Profile</a></li>
<li><a href="/logout">Logout</a></li>
</ul>
</div>
<% if @hide_player.nil? -%> <% if @hide_player.nil? -%>
<div id="player"> <div id="player">
<div id="audiobox"></div> <div id="audiobox"></div>
@ -38,7 +43,11 @@
<div id="playlist"> <div id="playlist">
<ul class="list"></ul> <ul class="list"></ul>
</div> </div>
<div class="corner-fix left"></div>
<div class="corner-fix right"></div>
<%- end %> <%- end %>
<div id="contents">
<div class="inner-1">
<%= yield %> <%= yield %>
</div> </div>
</div> </div>

1
config/routes.rb
View File

@ -12,6 +12,7 @@ Beathaven::Application.routes.draw do
match 'reg/complete' => 'user#complete' match 'reg/complete' => 'user#complete'
match 'login' => 'user#login' match 'login' => 'user#login'
match 'user/profile' => 'user#update' match 'user/profile' => 'user#update'
match 'user/invite' => 'user#invite'
match '*a', :to => 'errors#routing' match '*a', :to => 'errors#routing'
end end

49
public/stylesheets/beathaven.css
View File

@ -132,3 +132,52 @@ h1.artist > span > span.play {
padding: 0.2em; padding: 0.2em;
} }
#nav {
position: fixed;
z-index: 2;
top: 0;
left: 50%;
margin-left: -375px;
width: 750px;
height: 25px;
background-color: #000;
border-bottom: #222 1px solid;
}
#nav ul {
margin: 0 5px;
padding: 0;
list-style: none;
}
#nav ul li {
display: inline-block;
width: auto;
margin: 0 5px;
}
#nav ul li a {
color: #CCC;
line-height: 25px;
font-size: 12px;
text-decoration: none;
font-weight: bold;
}
#nav ul li a:hover {
color: #DDD;
}
.corner-fix {
position: fixed;
width: 8px;
height: 8px;
background-color: #000;
top: 25px;
left: 50%;
}
.corner-fix.left {
margin-left: -375px;
}
.corner-fix.right {
margin-left: 367px;
}

9
public/stylesheets/player.css
View File

@ -10,10 +10,11 @@ audio {
width: 750px; width: 750px;
height: 50px; height: 50px;
left: 50%; left: 50%;
top: 0; top: 25px;
margin-left: -375px; margin-left: -375px;
background-color: #000; background-color: #000;
font-size: 12px; font-size: 12px;
border-radius: 8px;
} }
#player .prev, #player .next, #player .play, #player .pause { #player .prev, #player .next, #player .play, #player .pause {
float: left; float: left;
@ -155,10 +156,10 @@ audio {
} }
#playlist { #playlist {
position: fixed; position: fixed;
top: 50px; top: 75px;
left: 50%; left: 50%;
width: 750px; width: 734px;
margin-left: -375px; margin-left: -367px;
background-color: #000; background-color: #000;
opacity: 0.9; opacity: 0.9;
-moz-opacity: 0.9; -moz-opacity: 0.9;