PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-25 22:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Unbroke some stuff

Browse source 
Getting creative with these names
This commit is contained in:
Josef Citrine 2016-05-21 23:22:43 +01:00
parent f60ab7c73f
commit 47160cd84c
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/templates/artists/_show_layout.html
View file

@ -1,6 +1,6 @@
<div class="resource-details artist-details" ng-class="::{'x-archived': artist.is_archived}"> <div class="resource-details artist-details" ng-class="::{'x-archived': artist.is_archived}">
<header ng-style="{{::gradient}}"> <header ng-style="{'background-image': 'linear-gradient(135deg, ' + artist.avatar_colors[0] + ' 15%, ' + artist.avatar_colors[1] + ' 100%)'}">
<img src="{{::artist.avatars.normal}}"> <img src="{{::artist.avatars.normal}}">
<div class="artist-right"> <div class="artist-right">
<h1>{{::artist.name}}</h1> <h1>{{::artist.name}}</h1>

3
resources/assets/scripts/app/controllers/artist.coffee
View file

@ -26,9 +26,6 @@ module.exports = angular.module('ponyfm').controller "artist", [
artists.fetch($state.params.slug) artists.fetch($state.params.slug)
.done (artistResponse) -> .done (artistResponse) ->
$scope.artist = artistResponse.artist $scope.artist = artistResponse.artist
$scope.gradient = {
'background-image': 'linear-gradient(135deg, ' + $scope.artist.avatar_colors[0] + ' 15%, ' + $scope.artist.avatar_colors[1] + ' 100%)'
}
$scope.toggleFollow = () -> $scope.toggleFollow = () ->
follow.toggle('artist', $scope.artist.id).then (res) -> follow.toggle('artist', $scope.artist.id).then (res) ->

13
resources/assets/styles/components/components.less vendored
View file

@ -375,23 +375,35 @@ html {
} }
.pagination { .pagination {
.border-radius(0px);
border: none; border: none;
background: #eee; background: #eee;
margin: 0px; margin: 0px;
margin-bottom: 10px; margin-bottom: 10px;
padding: 0px; padding: 0px;
overflow: hidden; overflow: hidden;
width: 100%;
ul { ul {
.border-radius(0px); .border-radius(0px);
margin: 5px; margin: 5px;
display: block; display: block;
overflow: hidden; overflow: hidden;
padding: 0;
width: 100%;
> li:first-child > a, > li:last-child > a { > li:first-child > a, > li:last-child > a {
.border-radius(0px); .border-radius(0px);
} }
.disabled {
a {
color: #999;
background-color: transparent;
cursor: default;
}
}
li { li {
display: block; display: block;
float: left; float: left;
@ -403,6 +415,7 @@ html {
display: block; display: block;
float: left; float: left;
color: @pfm-purple; color: @pfm-purple;
background-color: #fff;
} }
} }