# HG changeset patch # User veltr # Date 1373303207 -7200 # Node ID 10c2f4e5d37d7f0d2af3b219479a682f3ffe8971 # Parent 0964ccd9df959bfeb41d64011278b8c08a18b072 Updates for branding Aix diff -r 0964ccd9df95 -r 10c2f4e5d37d src/metadatacomposer/static/metadatacomposer/css/styles_player.css --- a/src/metadatacomposer/static/metadatacomposer/css/styles_player.css Thu Jun 27 16:31:59 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/css/styles_player.css Mon Jul 08 19:06:47 2013 +0200 @@ -605,19 +605,51 @@ } .about-box h3 { - text-align: center; font-weight: 700; font-size: 16px; + font-weight: 700; font-size: 16px; +} + +.about-partners { + margin: 10px 25px 5px; +} + +.about-text { + margin: 25px; +} + +.about-text p { + font-size: 15px; margin: 5px 0; +} + +.about-contents { + overflow: auto; padding-bottom: 20px; } .about-collaboration { - margin: 5px 0 40px; + margin: 5px 20px; +} + +.about-partner { + width: 50%; float: left; +} + +.about-partner img { + display: block; margin: 5px auto; height: 120px; } -.about-collaboration li { - width: 50%; float: left; text-align: center; font-size: 14px; +.about-partner h4 { + font-size: 15px; margin: 8px 0 0; text-align: center; } -.about-collaboration img { - display: block; margin: 5px auto; height: 120px; +.about-partner h3 { + margin: 10px 5px 5px; +} + +.about-partner li { + font-size: 14px; margin: 5px; +} + +.about-partner em { + font-style: italic; margin-right: 3px; } /* Bottom bar */ diff -r 0964ccd9df95 -r 10c2f4e5d37d src/metadatacomposer/static/metadatacomposer/js/player.js --- a/src/metadatacomposer/static/metadatacomposer/js/player.js Thu Jun 27 16:31:59 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/player.js Mon Jul 08 19:06:47 2013 +0200 @@ -639,10 +639,13 @@ } $(".about").click(function() { + myMedia.pause(); closeAnnotation(); var aboutBox = $(".annotation-templates .about-box").clone().appendTo($(".main-video")); aboutBox.find(".close-annotation").click(closeAnnotation); - aboutBox.css({ top: Math.floor(($(".main-video").height() - aboutBox.height())/2)+"px" }); + var mainH = $(".main-video").height(); + aboutBox.find(".about-contents").css("max-height", mainH - 100); + aboutBox.css("top", Math.floor((mainH - aboutBox.height())/2)+"px"); }); function closeAnnotation(e) { diff -r 0964ccd9df95 -r 10c2f4e5d37d src/metadatacomposer/templates/metadatacomposer/iri/composer_player_about.html --- a/src/metadatacomposer/templates/metadatacomposer/iri/composer_player_about.html Thu Jun 27 16:31:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer/iri/composer_player_about.html Mon Jul 08 19:06:47 2013 +0200 @@ -1,9 +1,11 @@ {% load static %}

À propos des Webdocs

-

Un lecteur créé par

- \ No newline at end of file +
+

Un lecteur créé par

+ +
\ No newline at end of file