diff --git a/app/Library/Assets.php b/app/Library/Assets.php index 5c3c1404..4cdbe968 100644 --- a/app/Library/Assets.php +++ b/app/Library/Assets.php @@ -97,8 +97,6 @@ class Assets { if ($area == 'app') { return [ - "styles/base/jquery-ui.css", - "styles/base/colorbox.css", "styles/app.less", ]; } else { diff --git a/package.json b/package.json index 6feb4b52..4b378f9b 100644 --- a/package.json +++ b/package.json @@ -7,17 +7,18 @@ "url": "ssh://git@phabricator.poniverse.net/diffusion/PF/pony-fm.git" }, "packages": {}, - "dependencies": { - "color-thief": "github:logic-dev/color-thief" - }, "devDependencies": { "angular": "1.5.6", + "angular-animate": "^1.5.8", + "angular-aria": "^1.5.8", "angular-chart.js": "1.0.0-alpha6", + "angular-material": "^1.1.0-rc.5", "angular-strap": "2.3.8", "angular-ui-router": "0.2.18", "chart.js": "2.1.0", "coffee-loader": "0.7.2", "coffee-script": "1.10.0", + "color-thief": "github:logic-dev/color-thief", "gulp": "3.9.1", "gulp-angular-templatecache": "1.8.0", "gulp-autoprefixer": "3.1.0", diff --git a/public/templates/account/_layout.html b/public/templates/account/_layout.html index 042b0ece..3c8910c0 100644 --- a/public/templates/account/_layout.html +++ b/public/templates/account/_layout.html @@ -1,19 +1,9 @@ - + + Upload music + Tracks + Albums + Playlists + Settings + diff --git a/public/templates/artists/_show_layout.html b/public/templates/artists/_show_layout.html index 066898b0..cdebc498 100644 --- a/public/templates/artists/_show_layout.html +++ b/public/templates/artists/_show_layout.html @@ -18,14 +18,12 @@ - + + Profile + Content + Favourites + Manage Account +
diff --git a/public/templates/directives/albums-list.html b/public/templates/directives/albums-list.html index eafd98d3..750624ff 100644 --- a/public/templates/directives/albums-list.html +++ b/public/templates/directives/albums-list.html @@ -1,4 +1,4 @@ -