#84 updated user-playlists style

orizens · Feb 19, 2016 · 86a12a0 · 86a12a0
1 parent 63137c8
commit 86a12a0
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 33 deletions.
diff --git a/src/app.js b/src/app.js
@@ -29,7 +29,7 @@ angular.module('echoes', [
 
 	// services
 	'LocalStorageModule',
-	AppCore.name,
+	AppCore,
 
 	// ui-components
 	YoutubeVideos.name,

diff --git a/src/components/now-playing/index.js b/src/components/now-playing/index.js
@@ -7,7 +7,7 @@ import playlistSaver from './playlist-saver';
 import youtubePlayer from '../youtube-player';
 
 export default angular.module('now-playing', [
-	    AppCore.name,
+	    AppCore,
 	    nowPlaylist.name,
 	    nowPlaylistFilter.name,
 	    playlistSaver.name,

diff --git a/src/components/playlist-editor/index.js b/src/components/playlist-editor/index.js
@@ -6,7 +6,7 @@ import PlaylistEditorSettings from './playlist-editor.settings.srv';
 import AngularBootstrap from 'angular-ui-bootstrap';
 
 export default angular.module('playlist-editor', [
-    AppCore.name,
+    AppCore,
     AngularBootstrap,
     AngularUiRouter
 ])

diff --git a/src/components/search-panel/search-filter-panel/presets/index.js b/src/components/search-panel/search-filter-panel/presets/index.js
@@ -1,9 +1,9 @@
 import angular from 'angular';
 import PresetCtrl from './preset.ctrl.js';
-import EchoesServices from '../../../../core';
+import AppCore from '../../../../core';
 
 export default angular.module('presets', [
-        EchoesServices.name,
+        AppCore,
         'LocalStorageModule'
     ])
     .controller('PresetCtrl', PresetCtrl)

diff --git a/src/components/user-playlists/index.js b/src/components/user-playlists/index.js
@@ -1,11 +1,13 @@
 import angular from 'angular';
 import uiRouter from 'angular-ui-router';
+import AngularAnimate from 'angular-animate';
 import AppCore from '../../core';
 import { UserPlaylistsComponent } from './user-playlists.component';
 
 export default angular.module('user-playlists', [
-	AppCore.name,
-	uiRouter
+	AppCore,
+	uiRouter,
+	AngularAnimate
 ])
 	.config(config)
 	.directive(UserPlaylistsComponent.controllerAs, () => UserPlaylistsComponent)

diff --git a/src/components/user-playlists/user-playlists.less b/src/components/user-playlists/user-playlists.less
@@ -1,6 +1,19 @@
-// actions cell
 .user-playlists {
 	.videos-list {
 		padding-left: 2rem;
 	}
+
+	.well {
+		&.ng-leave {
+			transition: all .5s ease-out;
+			transform: translatey(0rem);
+			opacity: 1;
+
+			&.ng-leave-active {
+				transform: translatey(5rem);
+				opacity:0;
+			}
+		}
+
+	}
 }
diff --git a/src/components/user-playlists/user-playlists.tpl.html b/src/components/user-playlists/user-playlists.tpl.html
@@ -5,7 +5,7 @@ <h2>My Playlists</h2>
 	<div class="col-md-12">
 		<input type="text" ng-model="userPlaylists.search" placeholder="find a playlist...">
 	</div>
-	<div ng-show="!userPlaylists.isUserSignedIn()" class="col-md-12 well text-center">
+	<div ng-if="!userPlaylists.isUserSignedIn()" class="col-md-12 well text-center">
 		<a href="" class="sign-in btn btn-primary btn-lg"
 			google-sign-in>
 			<span class="fa fa-google-plus-square"></span>

diff --git a/src/components/youtube-video/index.js b/src/components/youtube-video/index.js
@@ -4,7 +4,7 @@ import AppCore from '../../core';
 import { YoutubeVideoComponent } from './youtube-video.component';
 
 export default angular.module('youtube-video', [
-	AppCore.name,
+	AppCore,
 	AngularUiRouter
 ])
 	.config(config)

diff --git a/src/components/youtube-videos/index.js b/src/components/youtube-videos/index.js
@@ -6,7 +6,7 @@ import playlistEditor from '../playlist-editor';
 import InfiniteScroll from 'ng-infinite-scroll';
 
 export default angular.module('youtube-videos', [
-	AppCore.name,
+	AppCore,
 	'youtube.player',
 	uiRouter,
 	playlistEditor.name,

diff --git a/src/components/youtube-videos/youtube-videos.less b/src/components/youtube-videos/youtube-videos.less
@@ -4,7 +4,7 @@ youtube-videos {
 	display: block;
 }
 .youtube-videos {
-	padding-top: 9.5rem;
+	padding-top: 10rem;
 
 	.navbar {
 	    position: fixed;

diff --git a/src/core/index.js b/src/core/index.js
@@ -5,4 +5,5 @@ import services from './services';
 export default angular.module('app.core', [
 	components.name,
 	services.name
-]);
+])
+.name;
diff --git a/src/css/modules/Container.less b/src/css/modules/Container.less
@@ -65,17 +65,17 @@
 }
 
 .search-results {
-	&.ng-enter {
-		.transform(translate3d(0,-50px,0));
-		opacity: 0;
-	}
+	// &.ng-enter {
+	// 	.transform(translate3d(0,-50px,0));
+	// 	opacity: 0;
+	// }
 
-	&.ng-enter-active {
-		opacity: 1;
-	}
+	// &.ng-enter-active {
+	// 	opacity: 1;
+	// }
 
-	&.ng-leave {
-		.transform(translate3d(0,50px,0));
-		opacity: 0;
-	}
+	// &.ng-leave {
+	// 	.transform(translate3d(0,50px,0));
+	// 	opacity: 0;
+	// }
 }
diff --git a/src/css/modules/YoutubeItem.less b/src/css/modules/YoutubeItem.less
@@ -13,12 +13,10 @@
 		max-width: 100%;
 		margin: 0;
 		position: relative;
-		padding: 15px;
+		padding: 0 2rem 2rem 0;
 		border-radius: 0;
 		background-color: rgba(0,0,0,0);
 		box-shadow: none;
-		padding-left: 0 !important;
-	    padding-right: 3rem !important;
 	    border: none;
 
 		.media-title {

diff --git a/src/css/style.less b/src/css/style.less
@@ -78,13 +78,13 @@ iframe {
 	opacity: 0;
 }
 
-.main-view.ng-leave {
-	transform: translatex(-100%);
-}
+// .main-view.ng-leave {
+// 	transform: translatex(-100%);
+// }
 
-.main-view.ng-enter {
-	transform: translatex(0);
-}
+// .main-view.ng-enter {
+// 	transform: translatex(0);
+// }
 /* youtube styles */
 
 .show-description .btn.btn-mini.media-desc {