fix(core): 🐛 stricter selector for collapsible header

includes/Partials/BodyContent.php

@@ -174,9 +174,6 @@ private function makeSections( DOMDocument $doc, array $headingWrappers ) {
 		// Append the last section body.
 		$container->appendChild( $sectionBody );
 
-		// Mark subheadings
-		$this->markSubHeadings( $this->getSubHeadings( $doc ) );
-
 		return $doc;
 	}
 
@@ -248,53 +245,4 @@ private function getTopHeadings( DOMDocument $doc ): array {
 
 		return $headings;
 	}
-
-	/**
-	 * Marks the subheadings for the approiate styles by adding
-	 * the <code>section-subheading</code> class to each of them, if it
-	 * hasn't already been added.
-	 *
-	 * @param DOMElement[] $headings Heading elements
-	 */
-	protected function markSubHeadings( array $headings ) {
-		foreach ( $headings as $heading ) {
-			$class = $heading->getAttribute( 'class' );
-			if ( strpos( $class, 'section-subheading' ) === false ) {
-				$heading->setAttribute(
-					'class',
-					ltrim( $class . ' section-subheading' )
-				);
-			}
-		}
-	}
-
-	/**
-	 * Gets all subheadings in the document in rank order.
-	 *
-	 * @param DOMDocument $doc
-	 * @return DOMElement[]
-	 */
-	private function getSubHeadings( DOMDocument $doc ): array {
-		$found = false;
-		$subheadings = [];
-		foreach ( $this->topHeadingTags as $tagName ) {
-			$allTags = DOMCompat::querySelectorAll( $doc, $tagName );
-			$elements = [];
-			foreach ( $allTags as $el ) {
-				if ( $el->parentNode->getAttribute( 'class' ) !== 'toctitle' ) {
-					$elements[] = $el;
-				}
-			}
-
-			if ( $elements ) {
-				if ( !$found ) {
-					$found = true;
-				} else {
-					$subheadings = array_merge( $subheadings, $elements );
-				}
-			}
-		}
-
-		return $subheadings;
-	}
 }

resources/skins.citizen.styles/components/Sections.less

@@ -48,7 +48,10 @@
 
 		// Fix button alignment
 		&-heading,
-		&-subheading {
+		&-collapsible > h3,
+		&-collapsible > h4,
+		&-collapsible > h5,
+		&-collapsible > h6 {
 			display: flex;
 			align-items: center;