diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4a0e809..30d0d20 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,36 +9,45 @@ <%= csrf_meta_tag %> + + <% if @hide_player.nil? -%> +
+
+ +
ply
+ + +
0:00
+
+
No track
+
+
+
+
+
+
+
0:00
+
shu
+
rep
+
+ pls +
0
+
+
+
+ +
+
+
+ <%- end %>
- <% if @hide_player.nil? -%> -
-
- -
ply
- - -
0:00
-
-
No track
-
-
-
-
-
-
-
0:00
-
shu
-
rep
-
- pls -
0
-
-
-
-
    -
    - <%- end %> <%= yield %>
    diff --git a/config/routes.rb b/config/routes.rb index 3fd96d2..facd8b7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,6 +12,7 @@ Beathaven::Application.routes.draw do match 'reg/complete' => 'user#complete' match 'login' => 'user#login' match 'user/profile' => 'user#update' + match 'user/invite' => 'user#invite' match '*a', :to => 'errors#routing' end diff --git a/public/stylesheets/beathaven.css b/public/stylesheets/beathaven.css index cdbb7db..bbf7180 100644 --- a/public/stylesheets/beathaven.css +++ b/public/stylesheets/beathaven.css @@ -132,3 +132,52 @@ h1.artist > span > span.play { 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; +} \ No newline at end of file diff --git a/public/stylesheets/player.css b/public/stylesheets/player.css index 0034c1f..722be5f 100644 --- a/public/stylesheets/player.css +++ b/public/stylesheets/player.css @@ -10,10 +10,11 @@ audio { width: 750px; height: 50px; left: 50%; - top: 0; + top: 25px; margin-left: -375px; background-color: #000; font-size: 12px; + border-radius: 8px; } #player .prev, #player .next, #player .play, #player .pause { float: left; @@ -155,10 +156,10 @@ audio { } #playlist { position: fixed; - top: 50px; + top: 75px; left: 50%; - width: 750px; - margin-left: -375px; + width: 734px; + margin-left: -367px; background-color: #000; opacity: 0.9; -moz-opacity: 0.9;