Skip to content

Commit f7e460e

Browse files
computatecomputate
committed
Latest css improvements
1 parent 16feb20 commit f7e460e

File tree

1 file changed

+26
-20
lines changed

1 file changed

+26
-20
lines changed

‎src/main/java/org/computate/frFR/java/EcrirePageClasse.java‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,12 +2288,16 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
22882288
auteurPageCss.tl(2, "grid-column: span ", rechercheListe.size(), ";");
22892289
auteurPageCss.tl(2, "align-items: center;");
22902290
auteurPageCss.tl(2, "background-color: var(--", composantsWebPrefixe, "color-surface-raised);");
2291-
auteurPageCss.tl(2, "&:hover {");
2292-
auteurPageCss.tl(3, "background-color: var(--wa-color-brand-fill-quiet);");
2291+
auteurPageCss.tl(2, "border-radius: var(--", composantsWebPrefixe, "border-radius-pill);");
2292+
auteurPageCss.tl(2, "&:not(:first-child) {");
2293+
auteurPageCss.tl(3, "padding-inline-start: var(--", composantsWebPrefixe, "space-m);");
22932294
auteurPageCss.tl(2, "}");
2295+
// auteurPageCss.tl(2, "&:hover {");
2296+
// auteurPageCss.tl(3, "background-color: var(--", composantsWebPrefixe, "color-brand-fill-quiet);");
2297+
// auteurPageCss.tl(2, "}");
22942298
auteurPageCss.tl(2, composantsWebPrefixe, "button {");
22952299
auteurPageCss.tl(3, "&::part(base) {");
2296-
auteurPageCss.tl(4, "border-radius: initial;");
2300+
auteurPageCss.tl(4, "border-radius: var(--", composantsWebPrefixe, "border-radius-pill);");
22972301
auteurPageCss.tl(3, "}");
22982302
auteurPageCss.tl(2, "}");
22992303
auteurPageCss.tl(2, "@media (max-width:767px) {");
@@ -4124,9 +4128,6 @@ else if(entiteAttribuer) {
41244128
auteurPageJsEdition.tl(0, "Promise.all([");
41254129
auteurPageJsEdition.tl(2, "customElements.whenDefined('", composantsWebPrefixe, "button')");
41264130
auteurPageJsEdition.tl(2, ", customElements.whenDefined('", composantsWebPrefixe, "input')");
4127-
auteurPageJsEdition. tl(4, ", customElements.whenDefined('", composantsWebPrefixe, "checkbox')");
4128-
auteurPageJsEdition. tl(4, ", customElements.whenDefined('", composantsWebPrefixe, "option')");
4129-
auteurPageJsEdition. tl(4, ", customElements.whenDefined('", composantsWebPrefixe, "textarea')");
41304131
auteurPageJsEdition.tl(2, "]).then(() => {");
41314132

41324133
for(String classeApiMethode : classeApiMethodes) {
@@ -4390,7 +4391,6 @@ else if(classeApiMethode.contains(i18nPage.getString(I18n.var_PUTCopie)))
43904391

43914392

43924393
// formulaires //
4393-
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
43944394
tl(5, "<div id=\"htm", i18nPage.getString(I18n.var_Bouton), i18nPage.getString(I18n.var_Groupe), "\">");
43954395
tl(6, "<div class=\"flex flex-wrap round-column pill-smart-border-radius \">");
43964396

@@ -4665,15 +4665,16 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
46654665
////////////////////
46664666

46674667
tl(7, "{%- block htmBody", i18nPage.getString(I18n.var_Filtres), classePageNomSimple, " %}");
4668-
tl(7, "<div>");
4668+
tl(7, "<div class=\"flex flex-column gap-l \">");
46694669
tl(8, "{% for key, value in varsFq.items() %}");
4670-
tl(9, "<div class=\"\">");
4670+
tl(8, "<div>");
4671+
tl(9, "<div>");
46714672
t(10, "<label for=\"fq", classeNomSimple, "_{{ key }}\">");
46724673
s("{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}");
46734674
s("<sup> ({{ value.", i18nPage.getString(I18n.var_classeNomSimple), " }})</sup>");
46744675
l("</label>");
46754676

4676-
tl(10, "<", composantsWebPrefixe, "tooltip for=\"buttonFacet", classeNomSimple, "_{{ key }}\">", i18nPage.getString(I18n.str_voir_valeurs), "</", composantsWebPrefixe, "tooltip>");
4677+
tl(10, "<", composantsWebPrefixe, "tooltip for=\"buttonFacet", classeNomSimple, "_{{ key }}\">", i18nPage.getString(I18n.str_voir_valeurs), "</", composantsWebPrefixe, "tooltip>");
46774678
tl(10, "<div class=\"flex round-column pill-smart-border-radius \">");
46784679
t(11, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
46794680
s(" id=\"buttonFacet", classeNomSimple, "_{{ key }}\"");
@@ -4694,10 +4695,6 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
46944695
l("></", composantsWebPrefixe, "input>");
46954696
tl(10, "</div>");
46964697

4697-
tl(9, "</div>");
4698-
t(9, "<div");
4699-
s("");
4700-
l(">");
47014698
t(10, "<div");
47024699
s(" class=\"pageSearchVal \"");
47034700
s(" id=\"pageSearchVal-fq", classeNomSimple, "_{{ key }}\"");
@@ -4707,6 +4704,9 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
47074704
s(" id=\"pageSearchVal-buttonFacet", classeNomSimple, "_{{ key }}\"");
47084705
l(">{% if value.facetField.var is defined %}facet.field={{ value.facetField.var }}{% endif %}</div>");
47094706

4707+
tl(9, "</div>");
4708+
tl(9, "<div>");
4709+
47104710
t(10, "<div");
47114711
s(" class=\"pageFacetField pageFacetField", classeNomSimple, "_{{ key }} \"");
47124712
s(" id=\"pageFacetField", classeNomSimple, "_{{ key }}\"");
@@ -4715,11 +4715,11 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
47154715
tl(11, "<div>");
47164716
tl(12, "<", composantsWebPrefixe, "tooltip content=\"", String.format(i18nPage.getString(I18n.str_au_total_avec_), "{{ facetFieldValue | e }}", classeNomSingulier, "{{ value.facetField.var | e }}", "{{ facetFieldKey | e }}"), "\"></", composantsWebPrefixe, "tooltip>");
47174717
t(12, "<div");
4718-
s(" class=\"cursor-pointer \"");
4718+
s(" class=\"cursor-pointer raised-item \"");
47194719
s(" data-class=\"", classeNomSimple, "\"");
47204720
s(" data-var=\"{{ value.facetField.var }}\"");
47214721
s(" data-val=\"{{ facetFieldKey }}\"");
4722-
s(" onclick=\"fqReplace('", classeNomSimple, "', this); \"");
4722+
s(" onclick=\"if(document.querySelector('#fq", classeNomSimple, "_{{ key }}')?.value === '{{ facetFieldKey }}') this.setAttribute('data-val', ''); fqReplace('", classeNomSimple, "', this); \"");
47234723
s(">");
47244724
s("{{ facetFieldValue }}");
47254725
s(": ");
@@ -4730,6 +4730,7 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
47304730
tl(10, "</div>");
47314731

47324732
tl(9, "</div>");
4733+
tl(8, "</div>");
47334734
tl(8, "{% endfor %}");
47344735
tl(7, "</div>");
47354736

@@ -4872,7 +4873,7 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
48724873
tl(9, "<td class=\"\">");
48734874
t(10, "<", composantsWebPrefixe, "select");
48744875
s(" name=\"facet.range.gap\"");
4875-
s(" id=\"pageFacetRangeGap-", classeNomSimple, "\"");
4876+
s(" id=\"pageSearchVal-pageFacetRangeGap-", classeNomSimple, "-input\"");
48764877
s(" onchange=\"facet", i18nPage.getString(I18n.var_Gamme), "GapChange('", classeNomSimple, "', this); \"");
48774878
l(">");
48784879
tl(11, "<", composantsWebPrefixe, "option value=\"+1YEAR\"{% if defaultRangeGap == '+1YEAR' %} selected=\"selected\"{% else %}{% endif %}>Year</", composantsWebPrefixe, "option>");
@@ -5195,8 +5196,9 @@ public void ecrirePageRechercheAucun(String langueNom, JsonObject i18nPage) thro
51955196
l("</h1>");
51965197
tl(4, "</div>");
51975198

5198-
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
51995199
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
5200+
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
5201+
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
52005202

52015203
tl(4, "<h2>");
52025204
tl(5, "<span>");
@@ -5417,7 +5419,7 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
54175419
s("</a>");
54185420
l("</h1>");
54195421
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");
5420-
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
5422+
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
54215423
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
54225424
tl(0, "{% endif %}");
54235425

@@ -5477,7 +5479,10 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
54775479
// tl(6, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
54785480
// tl(6, "{{ htm", i18nPage.getString(I18n.var_BoutonsPagination), classePageNomSimple, "() }}");
54795481

5482+
tl(5, "<div class=\"", composantsWebPrefixe, "flank ", composantsWebPrefixe, "align-items-baseline margin-block-start \">");
54805483
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
5484+
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
5485+
tl(5, "</div>");
54815486
tl(5, "<div class=\"card-like-thing background-color-surface-border\" id=\"site-results-grid\">");
54825487
tl(6, "<div>");
54835488
s(wTh);
@@ -5563,8 +5568,9 @@ public void ecrirePageEditionJinja(String langueNom, JsonObject i18nPage) throws
55635568
tl(5, "<div class=\"margin-block\">");
55645569
tl(5, "</div>");
55655570

5566-
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
55675571
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
5572+
tl(5, "<", composantsWebPrefixe, "divider></", composantsWebPrefixe, "divider>");
5573+
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
55685574
tl(0, "{% endif %}");
55695575

55705576
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Debut), classePageNomSimple, " %}");

0 commit comments

Comments
 (0)