diff --git a/source/php/Component/Accordion/accordion.blade.php b/source/php/Component/Accordion/accordion.blade.php index ab1c05ee..a5c626aa 100644 --- a/source/php/Component/Accordion/accordion.blade.php +++ b/source/php/Component/Accordion/accordion.blade.php @@ -2,9 +2,9 @@ @if($list) <{{$componentElement}} class="{{ $class }}" js-expand-container {!! $attribute !!}> @foreach($list as $section) - <{{$sectionElement}} class="{{$baseClass}}__section" aria-label="{{$section['heading']}}"> + <{{$sectionElement}} class="{{$baseClass}}__section"> - <{{$sectionHeadingElement}} class="{{$baseClass}}__button" role="button" aria-controls="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-expanded="false" js-expand-button> + <{{$sectionHeadingElement}} class="{{$baseClass}}__button" role="button" aria-label="{{$section['heading']}}" aria-controls="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-expanded="false" js-expand-button> {!!$beforeHeading!!} diff --git a/source/php/Component/Accordion__item/accordion__item.blade.php b/source/php/Component/Accordion__item/accordion__item.blade.php index 1a5b2f52..cea53df4 100644 --- a/source/php/Component/Accordion__item/accordion__item.blade.php +++ b/source/php/Component/Accordion__item/accordion__item.blade.php @@ -1,6 +1,6 @@ {{-- Accordion Item --}} -<{{$sectionElement}} class="{{$class}}" {!! $attribute !!} aria-label="{{$heading}}"> - <{{$sectionHeadingElement}} class="{{$baseClass}}__button" aria-controls="{{ $baseClass }}__aria-{{ $id }}" aria-expanded="false" js-expand-button href="#{{$id}}"> +<{{$sectionElement}} class="{{$class}}" {!! $attribute !!}"> + <{{$sectionHeadingElement}} class="{{$baseClass}}__button" aria-label="{{$heading}} aria-controls="{{ $baseClass }}__aria-{{ $id }}" aria-expanded="false" js-expand-button href="#{{$id}}"> {!!$beforeHeading!!}