diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 9d67f22..7136416 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2424,12 +2424,10 @@ function template_preprocess_field(&$variables, $hook) { $variables['attributes']['class']['entity_type_css'] = strtr($element['#entity_type'], '_', '-'); $variables['attributes']['class']['field_name_css'] = strtr($element['#field_name'], '_', '-'); $variables['attributes']['class']['field_type_css'] = strtr($element['#field_type'], '_', '-'); - $variables['attributes']['class']['label_position'] = $element['#label_display']; - // Add a "clearfix" class to the wrapper since we float the label and the - // field items in field.module.css if the label is inline. + // Add the label position just in case that the label display is inline. if ($element['#label_display'] == 'inline') { - $variables['attributes']['class']['clearfix'] = 'clearfix'; + $variables['attributes']['class']['label_position'] = 'field-label-' . $element['#label_display']; } static $default_attributes; diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css index f397a5a..8a3bbc8 100644 --- a/core/modules/system/css/system.theme.css +++ b/core/modules/system/css/system.theme.css @@ -626,6 +626,11 @@ table tr.error { float: right; padding-left: 0.5em; } +.field-label-inline:after { + content: ""; + display: table; + clear: both; +} /* Form display */ form .field-edit-link { diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig index fc2b537..4574211 100644 --- a/core/modules/system/templates/field.html.twig +++ b/core/modules/system/templates/field.html.twig @@ -33,7 +33,11 @@ * @ingroup themeable */ #} -
+{% set cssclass %} + field field-{{attributes.class.entity_type_css}}--{{attributes.class.field_name_css}} field-name-{{attributes.class.field_name_css}} field-type-{{attributes.class.field_type_css}} +{% endset %} + +
{% if not label_hidden %}
{{ label }}: 
{% endif %}