diff --git a/ecrire/inc/presenter_enfants.php b/ecrire/inc/presenter_enfants.php index fe7a99998ab95e17272b9eeacf577c1ad256e6b9..a1d98c9fd0dd5c3da205da6301d4e1b1afcfc389 100644 --- a/ecrire/inc/presenter_enfants.php +++ b/ecrire/inc/presenter_enfants.php @@ -68,9 +68,9 @@ function enfant_rub($collection, $debut = 0, $limite = 500) { if ($voir_logo) { if ($logo = $chercher_logo($id_rubrique, 'id_rubrique', 'on')) { list($fid, $dir, $nom, $format) = $logo; - $logo = image_reduire("<img src='$fid' alt='' />", 70, 70); + $logo = image_passe_partout("<img src='$fid' alt='' />", 70, 70); if ($logo) { - $logo = inserer_attribut($logo, 'class', 'logo'); + $logo = wrap(inserer_attribut($logo, 'class', 'logo'),'<span class="logo-carre">'); } } } diff --git a/prive/themes/spip/box_skins.css.html b/prive/themes/spip/box_skins.css.html index 6281108cc3d4996289b86ef6813c9b26ef0b9559..0d0af649c8ff8c9777b3f2f48a69af7f8025157c 100644 --- a/prive/themes/spip/box_skins.css.html +++ b/prive/themes/spip/box_skins.css.html @@ -456,12 +456,14 @@ color: var(--spip-color-black); } /* Logo */ +.box.sous-rub .box__header .logo-carre { + padding: 0; +} .box.sous-rub .box__header .logo { - width: auto; - height: 100%; - max-height: calc((var(--spip-box-spacing-y) * 2) + 1.2em); /* = titre sur 1 ligne */ margin: 0; + border-top-#LEFT-radius: 0; border-top-#RIGHT-radius: var(--spip-box-border-radius); + border-bottom-#LEFT-radius: 0; border-bottom-#RIGHT-radius: var(--spip-box-border-radius); } /* Descriptif */ diff --git a/prive/themes/spip/lists.css.html b/prive/themes/spip/lists.css.html index a13f19b382e0040faf711a9115979bdfceef4828..d273fa5a0c815be895cf3891a5784facfa53fd93 100644 --- a/prive/themes/spip/lists.css.html +++ b/prive/themes/spip/lists.css.html @@ -75,8 +75,8 @@ .liste-objets.auteurs th.statut {line-height:1px;padding-bottom:0;} .liste-objets.auteurs td.nom .spip_logos { vertical-align: middle; margin-#ENV{right}: 0.3em; } -.liste-objets.articles tr td.logo,.liste-objets td.logo-carre {width: 70px; height: 70px; padding: 3px;} -.liste-objets.articles tr td.logo img,.liste-objets td.logo-carre img {width: 100%; height: 100%; object-fit: cover; border-radius: 5px;} +.liste-objets.articles tr td.logo, .logo-carre {width: 70px; height: 70px; padding: 3px;} +.liste-objets.articles tr td.logo img, .logo-carre img {width: 100%; height: 100%; object-fit: cover; border-radius: 5px;} <BOUCLE_objets(DATA){source table,#REM|lister_tables_objets_sql}>[ .liste-objets.[(#VALEUR{table_objet})] .caption {background-image:url((#CHEMIN_IMAGE{#VALEUR{icone_objet}|concat{-24.png}}));padding-#ENV{left}:30px;}]</BOUCLE_objets>