diff --git a/public/css/style.css b/public/css/style.css index 427d0ea..72e6c6b 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -3,39 +3,49 @@ html { } body { - padding-top: 50px; + padding-top: 70px; } [data-notify="title"] { display: block; } -#ngViewAnimationContainer { +.ng-enter { + -webkit-animation: fadeInLeft 0.5s; + animation: fadeInLeft 0.5s; +} + +.ng-leave { + -webkit-animation: fadeOutLeft 0.5s; + animation: fadeOutLeft 0.5s; +} + +body > .container { position: relative; } -[ng-view].ng-enter { +body > .container > .ng-enter { position: absolute; -webkit-animation: zoomIn 0.5s; animation: zoomIn 0.5s; } -[ng-view].ng-leave { +body > .container > .ng-leave { position: absolute; -webkit-animation: fadeOutDown 0.5s; animation: fadeOutDown 0.5s; } -#membre-list { +table { width: 90%; } -#membre-list .ng-enter { +table .ng-enter { -webkit-animation: fadeInLeft 0.5s; animation: fadeInLeft 0.5s; } -#membre-list .ng-leave { +table .ng-leave { -webkit-animation: fadeOutLeft 0.5s; animation: fadeOutLeft 0.5s; } diff --git a/public/js/app.js b/public/js/app.js index 689a4e9..bdf6f77 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -1,4 +1,4 @@ -angular.module('ciApp', ['ngRoute', 'ngAnimate', 'SessionsCtrl', 'ConnectCtrl', 'MembreCtrl']).config(['$routeProvider', '$locationProvider', +angular.module('ciApp', ['ngAnimate', 'ngRoute', 'SessionsCtrl', 'ConnectCtrl', 'MembreCtrl']).config(['$routeProvider', '$locationProvider', function ($routeProvider, $locationProvider) { $routeProvider .when('/', { diff --git a/public/js/controllers/SessionCtrl.js b/public/js/controllers/SessionCtrl.js index 4207861..0493fd9 100644 --- a/public/js/controllers/SessionCtrl.js +++ b/public/js/controllers/SessionCtrl.js @@ -1,5 +1,6 @@ angular.module('SessionsCtrl', ['SessionsServ']).controller('SessionCtrl', ['$scope', 'SessionServ', function ($scope, SessionServ) { + $scope.isCollapsed = false; $scope.session = SessionServ.cur; $scope.disconnect = function () { SessionServ.disconnect(); diff --git a/public/views/index.html b/public/views/index.html index bf160b4..43cdfc5 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -14,7 +14,6 @@ - @@ -30,17 +29,23 @@
-