diff --git a/components/grid_row/grid_row.twig b/components/grid_row/grid_row.twig index a852d2ba1026675d8a3c06d55be8536dee443c4a..619b6f7368d5630ce4ce0829f36a6195c14c2964 100644 --- a/components/grid_row/grid_row.twig +++ b/components/grid_row/grid_row.twig @@ -29,7 +29,7 @@ row_cols ? 'row-cols-' ~ row_cols, ]) %} -{% set col_attributes = create_attribute(col_attributes|default({})) %} +{% set col_attributes = create_attribute(col_attributes|default({})|merge(content['#attributes']|default({}))) %} {% set col_attributes = col_attributes.addClass([ 'col', col_xs, diff --git a/components/grid_row_1/grid_row_1.twig b/components/grid_row_1/grid_row_1.twig index d6bb383e1ea350e5299d040a0e931111d12c5b2c..7688e716238c3d28ab07333ffe7819b700d886ce 100644 --- a/components/grid_row_1/grid_row_1.twig +++ b/components/grid_row_1/grid_row_1.twig @@ -5,7 +5,7 @@ gutters_vertical, ]) %} -{% set col_attributes = create_attribute(col_attributes|default({})) %} +{% set col_attributes = create_attribute(col_attributes|default({})|merge(col_1_content['#attributes']|default({}))) %} {% set col_attributes = col_attributes.addClass([ 'col', col_xs ? 'col-' ~ col_xs, diff --git a/components/grid_row_2/grid_row_2.twig b/components/grid_row_2/grid_row_2.twig index 842be48fff24e548d9b745a1092e10006ab0e278..fcff903929749725f2fae34ac0e2b4b9b140ee9c 100644 --- a/components/grid_row_2/grid_row_2.twig +++ b/components/grid_row_2/grid_row_2.twig @@ -1,6 +1,6 @@ {% set col_attributes = [ - create_attribute(col_1_attributes|default({})), - create_attribute(col_2_attributes|default({})), + create_attribute(col_1_attributes|default({})|merge(col_1_content['#attributes']|default({}))), + create_attribute(col_2_attributes|default({})|merge(col_2_content['#attributes']|default({}))), ] %} {% set attributes = attributes.addClass([ diff --git a/components/grid_row_3/grid_row_3.twig b/components/grid_row_3/grid_row_3.twig index c4aac49b68edbbabfdc691ebe4c8c0c1f952c0d0..0f7e0ca4eed242bf0ff2005b9c94866d88f861a3 100644 --- a/components/grid_row_3/grid_row_3.twig +++ b/components/grid_row_3/grid_row_3.twig @@ -1,7 +1,7 @@ {% set col_attributes = [ - create_attribute(col_1_attributes|default({})), - create_attribute(col_2_attributes|default({})), - create_attribute(col_3_attributes|default({})), + create_attribute(col_1_attributes|default({})|merge(col_1_content['#attributes']|default({}))), + create_attribute(col_2_attributes|default({})|merge(col_2_content['#attributes']|default({}))), + create_attribute(col_3_attributes|default({})|merge(col_3_content['#attributes']|default({}))), ] %} {% set attributes = attributes.addClass([ diff --git a/components/grid_row_4/grid_row_4.twig b/components/grid_row_4/grid_row_4.twig index 4029423aec11ff39dedae0126e6d7ca79cbfdb04..08384769ffb8d303fdf84057675a068def3f40f4 100644 --- a/components/grid_row_4/grid_row_4.twig +++ b/components/grid_row_4/grid_row_4.twig @@ -1,8 +1,8 @@ {% set col_attributes = [ - create_attribute(col_1_attributes|default({})), - create_attribute(col_2_attributes|default({})), - create_attribute(col_3_attributes|default({})), - create_attribute(col_4_attributes|default({})), + create_attribute(col_1_attributes|default({})|merge(col_1_content['#attributes']|default({}))), + create_attribute(col_2_attributes|default({})|merge(col_2_content['#attributes']|default({}))), + create_attribute(col_3_attributes|default({})|merge(col_3_content['#attributes']|default({}))), + create_attribute(col_4_attributes|default({})|merge(col_4_content['#attributes']|default({}))), ] %} {% set attributes = attributes.addClass([