Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

This commit is contained in:
Ludovic Stephan 2016-09-19 16:13:54 +02:00
commit 9e438fac11

View file

@ -18,7 +18,7 @@
} }
.descTable{ .descTable{
width: auto; width: 100%;
margin: 0 auto 1em; margin: 0 auto 1em;
border-bottom: 2px solid; border-bottom: 2px solid;
border-collapse: collapse; border-collapse: collapse;
@ -70,6 +70,10 @@
// Correction de la taille des images // Correction de la taille des images
$(document).ready(function() { $(document).ready(function() {
$(".descTable").each(function() {
$(this).width($("body").width());
});
$(".imgDesc").on("load", function() { $(".imgDesc").on("load", function() {
// Dimensions // Dimensions
@ -78,7 +82,7 @@
w = $(this).width(); w = $(this).width();
h = $(this).height(); h = $(this).height();
r = w/h; // Ratio de l'image r = w/h; // Ratio de l'image
maxWidth = $(this).parent().width(); maxWidth = $("body").width();
if (r * origHeight > maxWidth) if (r * origHeight > maxWidth)
{ {