PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-02-12 08:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Finish hotfix-1

Browse source
This commit is contained in:
nelsonlaquet 2013-09-03 04:42:13 -05:00
commit f6713f67e7
5 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/views/shared/_app_layout.blade.php
View file

@ -45,24 +45,24 @@
<div class="site-body"> <div class="site-body">
<ul class="sidebar" ng-controller="sidebar"> <ul class="sidebar" ng-controller="sidebar">
@if (Auth::check()) @if (Auth::check())
<li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard <i class="icon-home"></i></a></li> <li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard</a></li>
@else @else
<li ng-class="{selected: stateIncludes('home')}"><a href="/">Home <i class="icon-home"></i></a></li> <li ng-class="{selected: stateIncludes('home')}"><a href="/">Home</a></li>
@endif @endif
<li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}"> <li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
<a href="/tracks">Discover <i class="icon-music"></i></a> <a href="/tracks">Discover</a>
</li> </li>
@if (Auth::check()) @if (Auth::check())
<li ng-class="{selected: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites <i class="icon-star"></i></a></li> <li ng-class="{selected: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
<li ng-class="{selected: stateIncludes('account')}"><a href="/account/tracks">Account <i class="icon-user"></i></a></li> <li ng-class="{selected: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
@endif @endif
<li ng-class="{selected: isActive('/about')}"><a href="/about">About <i class="icon-info"></i></a></li> <li ng-class="{selected: isActive('/about')}"><a href="/about">About</a></li>
@if (Auth::check()) @if (Auth::check())
<li class="uploader" ng-class="{selected: stateIncludes('uploader')}"> <li class="uploader" ng-class="{selected: stateIncludes('uploader')}">
<a href="/account/uploader">Upload Music <i class="icon-upload-alt"></i></a> <a href="/account/uploader">Upload Music</a>
</li> </li>
<li> <li>
<h3> <h3>
@ -75,7 +75,7 @@
<a href="{{Helpers::angular('playlist.url')}}" ng-bind="playlist.title"></a> <a href="{{Helpers::angular('playlist.url')}}" ng-bind="playlist.title"></a>
</li> </li>
@else @else
<li><a href="/login" target="_self">Login <i class="icon-user"></i></a></li> <li><a href="/login" target="_self">Login</a></li>
@endif @endif
</ul> </ul>
<ui-view class="site-content"> <ui-view class="site-content">

2
public/scripts/app/directives/share-buttons.coffee
View file

@ -2,5 +2,5 @@ angular.module('ponyfm').directive 'pfmShareButtons', () ->
(scope, element) -> (scope, element) ->
window.setTimeout((-> window.setTimeout((->
Tumblr.activate_share_on_tumblr_buttons() Tumblr.activate_share_on_tumblr_buttons()
FB.XFBML.parse() FB.XFBML.parse(null, -> element.addClass('loaded'))
), 0) ), 0)

9
public/styles/content.less
View file

@ -145,7 +145,16 @@
} }
.share-buttons { .share-buttons {
.transition(opacity 250ms ease-out);
margin-top: 5px; margin-top: 5px;
opacity: 0;
overflow: hidden;
height: 28px;
&.loaded {
opacity: 1;
overflow: visible;
}
.facebook, .twitter { .facebook, .twitter {
margin-top: 3px; margin-top: 3px;

11
public/styles/layout.less
View file

@ -19,7 +19,7 @@ header {
width: (@pfm-sidebar-size - 25); width: (@pfm-sidebar-size - 25);
height: 64px; height: 64px;
line-height: 52px; line-height: 52px;
background: @pfm-purple; background: #84528A;
color: #fff; color: #fff;
font-size: 24pt; font-size: 24pt;
padding-left: 25px; padding-left: 25px;
@ -29,7 +29,7 @@ header {
font-family: 'Josefin Sans', sans-serif; font-family: 'Josefin Sans', sans-serif;
&:hover { &:hover {
background: darken(@pfm-purple, 25%); background: darken(#84528A, 25%);
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
} }
@ -83,13 +83,14 @@ header {
.now-playing { .now-playing {
margin-left: @pfm-sidebar-size; margin-left: @pfm-sidebar-size;
height: 64px; height: 64px;
background: #eee; background: #fff;
position: relative; position: relative;
z-index: 500; z-index: 500;
border-bottom: 1px solid #bcbcbc;
} }
.sidebar { .sidebar {
background: @pfm-light-grey; background: #515151;
width: @pfm-sidebar-size; width: @pfm-sidebar-size;
height: 100%; height: 100%;
float: left; float: left;
@ -119,7 +120,7 @@ header {
margin: 0px; margin: 0px;
font-size: 10pt; font-size: 10pt;
color: #eee; color: #eee;
background: darken(@pfm-light-grey, 10%); background: darken(#515151, 5%);
line-height: normal; line-height: normal;
a { a {

12
public/styles/player.less
View file

@ -19,13 +19,13 @@ body.is-logged {
padding: 1px; padding: 1px;
img { img {
.img-polaroid();
.box-shadow(none); .box-shadow(none);
display: block; display: block;
width: 40px; width: 40px;
height: 40px; height: 40px;
padding: 1px; padding: 0px;
border: 1px solid #bcbcbc;
} }
.loader { .loader {
@ -77,15 +77,17 @@ body.is-logged {
} }
.transport { .transport {
.border-radius(4px);
background: #aaa; background: #aaa;
height: 8px; height: 5px;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
margin-top: 4px; margin-top: 4px;
.bar { .bar {
z-index: 500; z-index: 500;
background: @pfm-purple; background: #84528A;
} }
.loader-bar { .loader-bar {
@ -94,6 +96,8 @@ body.is-logged {
} }
.bar, .loader-bar { .bar, .loader-bar {
.border-radius(4px);
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;