Un peu d'habillage maintenant que les blocs peuvent être conteneurs

css/blocks_prive.css

@@ -19,12 +19,20 @@
 	position: relative;
 }
 
+.objetblock__blocks {
+	margin: var(--spip-box-spacing-x-normal);
+}
+
 .objetblock {
 	position: relative;
 	overflow: hidden;
 	border:1px solid var(--spip-color-gray-light);
 	border-radius:5px;
-	margin-bottom: 1rem;
+	margin-bottom: calc(var(--spip-box-spacing-y-normal) * 2);
+	padding: 0;
+}
+.objetblock .objetblock {
+	margin-bottom: var(--spip-box-spacing-y-normal);
 	padding: 0;
 }
 .objet_blocks .item:hover {
@@ -87,18 +95,16 @@
 	background-color: transparent;
 }
 
-.ajout_block  {
+.box .formulaire_editer_block,
+.formulaire_editer_block {
 	--spip-form-spacing-x: var(--spip-box-spacing-x-mini);
 	--spip-form-spacing-y: var(--spip-box-spacing-y-mini);
 	--spip-box-spacing-x: var(--spip-box-spacing-x-mini);
 	--spip-box-spacing-y: var(--spip-box-spacing-x-mini);
-}
-.ajout_block .formulaire_editer_block {
 	padding-left: var(--spip-form-spacing-x);
 	padding-right: var(--spip-form-spacing-x);
-	margin-bottom: calc(var(--spip-form-spacing-y) * 2);
-	margin-top: calc(var(--spip-form-spacing-y) * 2);
-	border-width: 0;
+	margin:0;
+	border: none;
 	background-color: var(--spip-color-gray-lightest);
 	box-shadow: none !important;
 }
@@ -112,7 +118,7 @@
 	background-position: left center;
 	background-size: 24px;
 	min-height: 24px;
-	padding: 8px 0 8px 30px;
+	padding: 0.66rem 0;
 	margin-bottom: 0;
 }
 
@@ -125,6 +131,10 @@
 .formulaire_spip .editer_id_blocktype.obligatoire label {
 	font-weight: normal;
 }
+.formulaire_spip .editer_id_blocktype .choix p:last-child,
+#wysiwyg .editer_id_blocktype .choix p:last-child {
+	margin-bottom: 0;
+}
 
 #wysiwyg .formulaire_spip .editer .explication {
 	margin-bottom: 0;

formulaires/editer_block.html

@@ -7,10 +7,11 @@
 		#ACTION_FORMULAIRE{#ENV{action}}
 
 		[(#ENV{include}|oui)
-		<p class="titre_ajouter" [style="background-image:url\((#CHEMIN_IMAGE{block-xx.svg})\);"]>
+		<div class="titre_ajouter">
+			[(#CHEMIN_IMAGE{block-16.png}|balise_img)]
 			[(#ENV{id_block}|intval|?{<:block:texte_modifier_block:/>,<:block:texte_ajouter_block:/>})]
 			[(#ENV{id_blocktype}|oui) : #INFO_TITRE{blocktype,#ENV{id_blocktype}} ]
-		</p>
+		</div>
 		<span class="toggle_box_link" style="display:none;">
 			<button type="button" class="btn btn_mini"><:block:texte_ajouter_block:/></button>
 		</span>
@@ -21,12 +22,12 @@
 		</div>
 
 		<p class="boutons">
-			[(#ENV{include}|oui)<button type="submit" name="annuler" value="1" data-id_block="#ENV{id_block,new}" class="submit btn btn_secondaire"><:bouton_annuler:/></button>]
+			[(#ENV{include}|oui)<button type="submit" class="submit btn btn_secondaire btn_mini" name="annuler" value="1" data-id_block="#ENV{id_block,new}"><:bouton_annuler:/></button>]
 			[(#ENV{id_blocktype}|non)
-				<button type="submit" class="submit" name="choisir" value="1"><:block:bouton_choisir:/></button>
+				<button type="submit" class="submit btn btn_mini" name="choisir" value="1"><:block:bouton_choisir:/></button>
 			]
 			[(#ENV{id_blocktype}|oui)
-				<button type="submit" class="submit btn" name="ajouter" value="1">[(#ENV{id_block}|?{<:block:bouton_enregistrer:/>,<:block:bouton_ajouter:/>})]</button>
+				<button type="submit" class="submit btn btn_mini" name="ajouter" value="1">[(#ENV{id_block}|?{<:block:bouton_enregistrer:/>,<:block:bouton_ajouter:/>})]</button>
 			]
 		</p>
 

prive/squelettes/inclure/block.html

@@ -47,7 +47,7 @@
 </BOUCLE>
 
 [(#ENV{edit_bloc}|oui)
-<div class="ajax ajout_block" id="block_#ENV{id_block,new}">
+<div class="ajax objetblock" id="block_#ENV{id_block,new}">
 	[(#FORMULAIRE_EDITER_BLOCK{#ENV{id_block,new}, #OBJET, #ID_OBJET, #ENV{id_blocktype_parent}, #SELF|ancre_url{block_#ENV{id_block,new}}, 1})]
 </div>
 ]