From 6295ef230f447cabd576fb8a5287a7c6b5f8faa3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 9 Jun 2023 20:41:27 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20lever=20l'ambiguit=C3=A9=20sur=20les=20b?=
=?UTF-8?q?alises=20simples=20des=20`url()`=20suite=20=C3=A0=20la=20compre?=
=?UTF-8?q?hension=20plus=20large=20des=20balises=20=C3=A9tendues=20par=20?=
=?UTF-8?q?le=20phraseur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Refs: #3637
---
prive/themes/spip/alertes.css.html | 10 +++++-----
prive/themes/spip/bando.css.html | 6 +++---
prive/themes/spip/boutons.css.html | 10 +++++-----
prive/themes/spip/box.css.html | 8 ++++----
prive/themes/spip/content.css.html | 6 +++---
prive/themes/spip/forms.css.html | 2 +-
prive/themes/spip/icons.css.html | 8 ++++----
prive/themes/spip/picker.css.html | 17 ++++++++---------
8 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/prive/themes/spip/alertes.css.html b/prive/themes/spip/alertes.css.html
index 99231b80aa..8100e27d0f 100644
--- a/prive/themes/spip/alertes.css.html
+++ b/prive/themes/spip/alertes.css.html
@@ -142,7 +142,7 @@
color: hsl(var(--spip-color-notice--h), var(--spip-color-notice--s), 18%);
background-color: hsl(var(--spip-color-notice--h), 90%, 88%);
border-color: hsl(var(--spip-color-notice--h), 100%, 48%);
- background-image: url(#CHEMIN_IMAGE{warning-24.png});
+ background-image: url("#CHEMIN_IMAGE{warning-24.png}");
}
/* Erreur */
@@ -152,7 +152,7 @@
color: hsl(var(--spip-color-error--h), var(--spip-color-error--s), 18%);
background-color: hsl(var(--spip-color-error--h), 60%, 95%);
border-color: hsl(var(--spip-color-error--h), var(--spip-color-error--s), 50%);
- background-image: url(#CHEMIN_IMAGE{erreur-24.png});
+ background-image: url("#CHEMIN_IMAGE{erreur-24.png}");
}
/* Succès */
@@ -162,7 +162,7 @@
color: hsl(var(--spip-color-success--h), var(--spip-color-success--s), 15%);
background-color: hsl(var(--spip-color-success--h), 55%, 90%);
border-color: hsl(var(--spip-color-success--h), var(--spip-color-success--s), 45%);
- background-image: url(#CHEMIN_IMAGE{ok-24.png});
+ background-image: url("#CHEMIN_IMAGE{ok-24.png}");
}
/* Information */
@@ -171,7 +171,7 @@
color: hsl(var(--spip-color-info--h), var(--spip-color-info--s), 25%);
background-color: hsl(var(--spip-color-info--h), 45%, 93%);
border-color: hsl(var(--spip-color-info--h), var(--spip-color-info--s), 60%);
- background-image: url(#CHEMIN_IMAGE{info-24.png});
+ background-image: url("#CHEMIN_IMAGE{info-24.png}");
}
@@ -224,4 +224,4 @@
/* Bloc ajax invalid apres reload */
.ajaxbloc.invalid {
box-shadow: 0 0 var(--spip-alert-spacing-x) hsl(var(--spip-color-error--h), var(--spip-color-error--s), 50%);
-}
\ No newline at end of file
+}
diff --git a/prive/themes/spip/bando.css.html b/prive/themes/spip/bando.css.html
index 76ea6a9f24..6bda262a55 100644
--- a/prive/themes/spip/bando.css.html
+++ b/prive/themes/spip/bando.css.html
@@ -574,10 +574,10 @@
}
/* Icônes secteur / rubriques selon la profondeur */
.deroulant_rubriques .deroulant__lien[data-profondeur="1"] {
- background-image: url(#CHEMIN_IMAGE{secteur-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{secteur-xx.svg}");
}
.deroulant_rubriques [data-profondeur="2"] .deroulant__lien {
- background-image: url(#CHEMIN_IMAGE{rubrique-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{rubrique-xx.svg}");
}
/* picto pour indiquer les items dépliants */
.deroulant_rubriques .deroulant__item_parent > .deroulant__lien {
@@ -588,7 +588,7 @@
display: block;
width: var(--spip-deroulant-icon-size);
height: var(--spip-deroulant-icon-size);
- background-image: url(#CHEMIN_IMAGE{deplier-right.svg});
+ background-image: url("#CHEMIN_IMAGE{deplier-right.svg}");
background-repeat: no-repeat;
background-position: center center;
background-size: contain;
diff --git a/prive/themes/spip/boutons.css.html b/prive/themes/spip/boutons.css.html
index a80ed34cfd..50f403caa1 100644
--- a/prive/themes/spip/boutons.css.html
+++ b/prive/themes/spip/boutons.css.html
@@ -135,8 +135,8 @@ button {
user-select: none;
transition: all 0.1s;
}
-a.btn,
-#wysiwyg a.btn, #wysiwyg a.btn:hover,
+a.btn,
+#wysiwyg a.btn, #wysiwyg a.btn:hover,
input.submit,
input.reset,
button {
@@ -395,7 +395,7 @@ button.btn_danger {
background-color: transparent;
border-color: transparent transparent var(--spip-btn-color-border-accent);
color: var(--spip-btn-color-black);
- background-image: url(#CHEMIN_IMAGE{rayures-sup.svg});
+ background-image: url("#CHEMIN_IMAGE{rayures-sup.svg}");
text-shadow: 0 0 0.25em white, 0 0 0.5em white, 0 0 1em white; /* Lisibilité */
}
.btn_danger:hover,
@@ -494,7 +494,7 @@ button.btn_#VALEUR,
}
/* Dans le footer d'une boîte */
-.box__footer .bouton_action_post {
+.box__footer .bouton_action_post {
margin-bottom: 0;
}
@@ -758,4 +758,4 @@ input.reset.sp-icone:before,
padding: var(--spip-btn-padding-y-mini) var(--spip-btn-padding-x-mini);
border-radius: var(--spip-btn-border-radius-mini);
margin-bottom: var(--spip-btn-margin-mini);
-}
\ No newline at end of file
+}
diff --git a/prive/themes/spip/box.css.html b/prive/themes/spip/box.css.html
index d45b7beb4f..8647334370 100644
--- a/prive/themes/spip/box.css.html
+++ b/prive/themes/spip/box.css.html
@@ -341,7 +341,7 @@
}
.box.notice .box__header,
.box.notice .box__body:first-child {
- background-image: url(#CHEMIN_IMAGE{warning-32.png});
+ background-image: url("#CHEMIN_IMAGE{warning-32.png}");
}
/* Erreur */
@@ -354,7 +354,7 @@
}
.box.error .box__header,
.box.error .box__body:first-child {
- background-image: url(#CHEMIN_IMAGE{erreur-32.png});
+ background-image: url("#CHEMIN_IMAGE{erreur-32.png}");
}
/* Succès */
@@ -367,7 +367,7 @@
}
.box.success .box__header,
.box.success .box__body:first-child {
- background-image: url(#CHEMIN_IMAGE{ok-32.png});
+ background-image: url("#CHEMIN_IMAGE{ok-32.png}");
}
@@ -597,7 +597,7 @@
background-image: url([(#CHEMIN_IMAGE{deplierhaut.svg})]);
}
.box .deplie .titremancre {
- background-image: url(#CHEMIN_IMAGE{deplierbas.svg});
+ background-image: url("#CHEMIN_IMAGE{deplierbas.svg}");
}
.box .impliable .titremancre {
display: none;
diff --git a/prive/themes/spip/content.css.html b/prive/themes/spip/content.css.html
index ab20e18ad0..1605771b77 100644
--- a/prive/themes/spip/content.css.html
+++ b/prive/themes/spip/content.css.html
@@ -139,10 +139,10 @@ a.boutonlien { color: #808080; text-decoration: none; }
a.triangle_block { margin-top: -3px; margin-bottom: -3px; margin-#ENV{right}: -3px; opacity: 0.7; }
a.triangle_block:hover { opacity: 1; }
-a.ical { background: url(#CHEMIN_IMAGE{synchro-24.png}) no-repeat; background-position: top center; padding-#ENV{left}: 30px; padding-bottom: 20px; }
+a.ical { background: url("#CHEMIN_IMAGE{synchro-24.png}") no-repeat; background-position: top center; padding-#ENV{left}: 30px; padding-bottom: 20px; }
.enfants ul { list-style: none; }
-.enfants ul li.rubrique_12 {background:url(#CHEMIN_IMAGE{rubrique-xx.svg})[ (#ENV{left})] center no-repeat; background-size:12px; padding: 2px; padding-#ENV{left}: 18px; margin-#ENV{left}: 6px;position:relative;}
+.enfants ul li.rubrique_12 {background:url("#CHEMIN_IMAGE{rubrique-xx.svg}")[ (#ENV{left})] center no-repeat; background-size:12px; padding: 2px; padding-#ENV{left}: 18px; margin-#ENV{left}: 6px;position:relative;}
/* menu langues */
@@ -296,7 +296,7 @@ li .puce_article_popup, li.puce_breve_popup,li.puce_site_popup { padding: 0; }*/
/* fond des miniatures de logos et documents */
.miniature_logo, .miniature_document {
- background: url(#CHEMIN_IMAGE{fond-grille.gif}) top left;
+ background: url("#CHEMIN_IMAGE{fond-grille.gif}") top left;
}
h2.titrem { display: block; padding-top: 6px; padding-bottom: 4px; background-repeat: no-repeat;padding-[(#ENV{left})]:16px;background-color: #ENV{claire};font-size:14px;}
diff --git a/prive/themes/spip/forms.css.html b/prive/themes/spip/forms.css.html
index 22d75bf5c1..627a5558f2 100644
--- a/prive/themes/spip/forms.css.html
+++ b/prive/themes/spip/forms.css.html
@@ -1156,7 +1156,7 @@
.formulaire_editer_logo .spip_logo img,
#illustrations .vignette img,
#documents_joints .image img.spip_logo {
- background: url(#CHEMIN_IMAGE{fond-imgs.png});
+ background: url("#CHEMIN_IMAGE{fond-imgs.png}");
}
#illustrations .vignette img.spip_document_icone {
background-image:none;
diff --git a/prive/themes/spip/icons.css.html b/prive/themes/spip/icons.css.html
index 54bee6658a..f0f5c7e6f1 100644
--- a/prive/themes/spip/icons.css.html
+++ b/prive/themes/spip/icons.css.html
@@ -147,7 +147,7 @@
#SET{icones, #LISTE{add, new, del, config, edit}}
<BOUCLE_icones_images(DATA){source table, #GET{icones}}>
.icone-fonction-#VALEUR:after {
- background-image: url(#CHEMIN_IMAGE{#VALEUR-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{#VALEUR-xx.svg}");
}
</BOUCLE_icones_images>
@@ -245,7 +245,7 @@
/* Variante danger (Ã mutualiser avec boutons.css ?) */
.icone.danger a {
- background-image: url(#CHEMIN_IMAGE{rayures-sup.svg});
+ background-image: url("#CHEMIN_IMAGE{rayures-sup.svg}");
background-color: transparent;
}
.icone.danger b {
@@ -332,7 +332,7 @@
padding: 3px;
margin: 1px;
border: 1px dashed #000;
- background: #fce8dd url(#CHEMIN_IMAGE{rayures-danger.svg});
+ background: #fce8dd url("#CHEMIN_IMAGE{rayures-danger.svg}");
}
/* OLDIES anciennes icones issues de php */
@@ -351,4 +351,4 @@ td.icone a:hover {
td.icone a img {
border: 0;
-}
\ No newline at end of file
+}
diff --git a/prive/themes/spip/picker.css.html b/prive/themes/spip/picker.css.html
index 95e47c6962..44cbfe4a04 100644
--- a/prive/themes/spip/picker.css.html
+++ b/prive/themes/spip/picker.css.html
@@ -19,8 +19,8 @@
/* Ancien selecteur de rubriques */
.selecteur_parent{font-size: 90%; width: 99%;} /* appliquee sur le <select> */
-option.selec_rub { background-position: [(#GET{left})] center; background-image: url(#CHEMIN_IMAGE{rubrique-xx.svg}); background-size:12px; background-repeat: no-repeat; padding-#GET{left}: 16px; }
-option.niveau_1 { font-weight: bold; background: #GET{claire}; background-image: url(#CHEMIN_IMAGE{secteur-xx.svg}); background-size: 12px; background-repeat: no-repeat; color: #444;}
+option.selec_rub { background-position: [(#GET{left})] center; background-image: url("#CHEMIN_IMAGE{rubrique-xx.svg}"); background-size:12px; background-repeat: no-repeat; padding-#GET{left}: 16px; }
+option.niveau_1 { font-weight: bold; background: #GET{claire}; background-image: url("#CHEMIN_IMAGE{secteur-xx.svg}"); background-size: 12px; background-repeat: no-repeat; color: #444;}
option.niveau_2 { background:#eee; color: #202020; border-bottom: 1px solid #GET{claire}; }
option.niveau_3 { background:#eee; color: #404040; }
option.niveau_4 { background:#eee; color: #606060; }
@@ -32,7 +32,7 @@ option.niveau_6 { background:#eee; color: #a0a0a0; }
div.petite-racine,
a.petite-racine {
background: [(#ENV{ltr}|choixsiegal{left,1,99})%] no-repeat;
- background-image: url(#CHEMIN_IMAGE{racine-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{racine-xx.svg}");
background-size: 14px;
background-position: 5px center;
padding-#LEFT: 24px;
@@ -48,7 +48,7 @@ a.petite-racine {
div.petite-rubrique,
a.petite-rubrique {
background: [(#ENV{ltr}|choixsiegal{left,1,99})%] no-repeat;
- background-image: url(#CHEMIN_IMAGE{rubrique-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{rubrique-xx.svg}");
background-size:14px;
background-position: 5px center;
padding-#LEFT: 24px;
@@ -57,7 +57,7 @@ a.petite-rubrique {
div.petit-secteur,
a.petit-secteur {
background: [(#ENV{ltr}|choixsiegal{left,1,99})%] no-repeat;
- background-image: url(#CHEMIN_IMAGE{secteur-xx.svg});
+ background-image: url("#CHEMIN_IMAGE{secteur-xx.svg}");
background-size: 14px;
background-position: 5px center;
padding-#GET{left}: 24px;
@@ -211,9 +211,9 @@ a.petit-secteur {
/* Les éléments propres à chaque objet */
<BOUCLE_objets(DATA){source table, (#NULL|lister_tables_objets_sql)}>
[(#SET{petite_icone, [(#CHEMIN_IMAGE{#VALEUR{icone_objet}-12.png}|sinon{[(#CHEMIN_IMAGE{#VALEUR{icone_objet}-16.png}|image_reduire{12}|extraire_attribut{src})]})]})]
-ul.item_picked li.#VALEUR{type} {padding-#GET{left}:24px;background-image:url(#GET{petite_icone});background-size:12px;}
-.item_picker .[(#VALEUR{table_objet})] .type_objet {padding-#GET{left}:24px; background:url(#GET{petite_icone}) no-repeat[ (#GET{left}) ]center; background-size:12px;}
-.item_picker .frame ul li.#VALEUR{type} {background:url(#GET{petite_icone}) no-repeat[ (#GET{left}) ]2px;background-size:12px;}
+ul.item_picked li.#VALEUR{type} {padding-#GET{left}:24px;background-image:url("#GET{petite_icone}");background-size:12px;}
+.item_picker .[(#VALEUR{table_objet})] .type_objet {padding-#GET{left}:24px; background:url("#GET{petite_icone}") no-repeat[ (#GET{left}) ]center; background-size:12px;}
+.item_picker .frame ul li.#VALEUR{type} {background:url("#GET{petite_icone}") no-repeat[ (#GET{left}) ]2px;background-size:12px;}
</BOUCLE_objets>
/* Styles des éléments déjà sélectionnés */
@@ -287,4 +287,3 @@ ul.item_picked.changing {}
.formulaire_spip li.selecteur_item label {
margin-#GET{left}:0;display:block;float:left;padding:2px 0;
}
-
--
GitLab