From cec8f5eb30eeffbfc6a574c89d1602dd78c722db Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Sat, 26 Sep 2015 13:37:21 +0200 Subject: [PATCH] Issue #2471739 by RajeevK, martins.kajins, LewisNyman, jaxxed: Convert reusable layout classes to BEM standards --- .../config_translation_manage_form_element.html.twig | 4 ++-- core/modules/help/src/Controller/HelpController.php | 2 +- core/modules/system/css/system.admin.css | 6 +++--- core/modules/system/templates/admin-page.html.twig | 2 +- core/modules/update/templates/update-version.html.twig | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/modules/config_translation/templates/config_translation_manage_form_element.html.twig b/core/modules/config_translation/templates/config_translation_manage_form_element.html.twig index 672f5677f60d..777514f41bfd 100644 --- a/core/modules/config_translation/templates/config_translation_manage_form_element.html.twig +++ b/core/modules/config_translation/templates/config_translation_manage_form_element.html.twig @@ -15,10 +15,10 @@ */ #} <div class="translation-set clearfix"> - <div class="layout-column half translation-set__source"> + <div class="layout-column layout-column--half translation-set__source"> {{ element.source }} </div> - <div class="layout-column half translation-set__translated"> + <div class="layout-column layout-column--half translation-set__translated"> {{ element.translation }} </div> </div> diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php index 4ebd4c8ef3b8..dcb50bdf0a27 100644 --- a/core/modules/help/src/Controller/HelpController.php +++ b/core/modules/help/src/Controller/HelpController.php @@ -77,7 +77,7 @@ protected function helpLinksAsList() { $column = array( '#type' => 'container', 'links' => array('#theme' => 'item_list'), - '#attributes' => array('class' => array('layout-column', 'quarter')), + '#attributes' => array('class' => array('layout-column', 'layout-column--quarter')), ); $output = array( '#prefix' => '<div class="clearfix">', diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css index b01e40521117..1d9a51c981cf 100644 --- a/core/modules/system/css/system.admin.css +++ b/core/modules/system/css/system.admin.css @@ -33,13 +33,13 @@ padding-right: 10px; padding-left: 0; } - .layout-column.half { + .layout-column--half { width: 50%; } - .layout-column.quarter { + .layout-column--quarter { width: 25%; } - .layout-column.three-quarter { + .layout-column--three-quarter { width: 75%; } } diff --git a/core/modules/system/templates/admin-page.html.twig b/core/modules/system/templates/admin-page.html.twig index 038b1af2a6eb..b3808e468d76 100644 --- a/core/modules/system/templates/admin-page.html.twig +++ b/core/modules/system/templates/admin-page.html.twig @@ -17,7 +17,7 @@ <div class="clearfix"> {{ system_compact_link }} {% for container in containers %} - <div class="layout-column half"> + <div class="layout-column--half"> {% for block in container.blocks %} {{ block }} {% endfor %} diff --git a/core/modules/update/templates/update-version.html.twig b/core/modules/update/templates/update-version.html.twig index 612f5d4f9b6d..2d5520fa58d2 100644 --- a/core/modules/update/templates/update-version.html.twig +++ b/core/modules/update/templates/update-version.html.twig @@ -19,12 +19,12 @@ #} <div class="{{ attributes.class }} project-update__version"{{ attributes|without('class') }}> <div class="clearfix"> - <div class="project-update__version-title layout-column quarter">{{ title }}</div> - <div class="project-update__version-details layout-column quarter"> + <div class="project-update__version-title layout-column layout-column--quarter">{{ title }}</div> + <div class="project-update__version-details layout-column layout-column--quarter"> <a href="{{ version.release_link }}">{{ version.version }}</a> <span class="project-update__version-date">({{ version.date|date('Y-M-d') }})</span> </div> - <div class="layout-column half"> + <div class="layout-column layout-column--half"> <ul class="project-update__version-links"> <li class="project-update__download-link"> <a href="{{ version.download_link }}">{{ 'Download'|t }}</a> -- GitLab