# HG changeset patch # User rougeronj # Date 1436370344 -7200 # Node ID a3e1106b6f967bbcc35d6e1d0f7bde570b7f5c3b # Parent 4a79d51d0b50e70b22f6da84931076b269e26400 update interface of the slideshow diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/app.js --- a/client/app/app.js Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/app.js Wed Jul 08 17:45:44 2015 +0200 @@ -15,11 +15,6 @@ }); $routeProvider. - when('/', { - controller: 'homeCtrl', - templateUrl: 'home/home.html', - authRequired: false - }). when('/my_visit', { controller: 'my_visitCtrl', templateUrl: 'my_visit/my_visit.html', @@ -71,7 +66,7 @@ authRequired: false }). otherwise({ - redirectTo: '/' + redirectTo: '/my_visit' }); }) .run( function($rootScope, $location, $window, $http, authApi, context) { diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/books/book.css --- a/client/app/books/book.css Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/books/book.css Wed Jul 08 17:45:44 2015 +0200 @@ -41,6 +41,9 @@ border: 1px solid #cdcdcd; } +.gallery .item a{ + text-decoration: none; +} .gallery .item p { text-align: center; color: #505050; diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/components/app_service.js --- a/client/app/components/app_service.js Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/components/app_service.js Wed Jul 08 17:45:44 2015 +0200 @@ -109,7 +109,7 @@ restrict: 'AE', link: function(scope, elem) { elem.bind('error', function() { - elem.parents('li.item').addClass('no-img'); + elem.parent().addClass('no-img'); elem.remove(); }); elem.on('load', function() { diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/slides/slides.css --- a/client/app/slides/slides.css Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/slides/slides.css Wed Jul 08 17:45:44 2015 +0200 @@ -20,7 +20,6 @@ } .media{ - border-right:1px solid grey; height: 100%; padding: 20px; } diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/slideshow/slideshow.css --- a/client/app/slideshow/slideshow.css Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/slideshow/slideshow.css Wed Jul 08 17:45:44 2015 +0200 @@ -9,14 +9,15 @@ .slideshow-content{ margin-bottom : 15px; height: 465px; + padding-top: 2px; } .slideshow-content .media{ - border: 1px solid #a8a8a8; + box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.75); } .slideshow-content .caption{ - border-top: 1px solid #a8a8a8; + box-shadow: 1px 0px 4px -1px rgba(0, 0, 0, 0.75); color: #000; position: static; text-shadow: none; @@ -24,10 +25,19 @@ overflow: scroll; height: 100% } + +.caption .user-details{ + min-height: 70%; } -.slideshow-title .book{ - font-size: 15px; + +.caption .user-details h1{ + margin-top:0; } + +.caption .details{ + min-height: 30%; +} + .slideshow-title h1 { display: inline-block; padding:0 15px; @@ -75,11 +85,19 @@ display: inline-block; position:relative; height: 115px; - width: 13%; + width: 14%; padding: 0; margin: 0 5px; + overflow: hidden; +} +.insight .item.no-img { + background-color: #f4f4f4; border: 1px solid #cdcdcd; - overflow: hidden; +} +.insight .item.no-img p{ + position: relative; + top: 50%; + transform: translateY(-50%); } .insight .item img { position: absolute; diff -r 4a79d51d0b50 -r a3e1106b6f96 client/app/slideshow/slideshow.html --- a/client/app/slideshow/slideshow.html Wed Jul 08 12:48:37 2015 +0200 +++ b/client/app/slideshow/slideshow.html Wed Jul 08 17:45:44 2015 +0200 @@ -1,12 +1,12 @@
-
+

{{book.title}} par Jonathan Linvingston

-

{{book.count}} points d'intĂ©rĂȘts

+

{{book.count}} elts.

-