From 62c63bd3187b8e2249c85c7cbcb083f79542f47c Mon Sep 17 00:00:00 2001
From: lolandese <lolandese@210402.no-reply.drupal.org>
Date: Thu, 7 May 2020 13:52:48 -0500
Subject: [PATCH] Issue #3134136 by lolandese: License "GPL-2.0+" is a
deprecated SPDX license identifier
---
...arrio-handle_prefix_suffix-3128006-2.patch | 33 -------------------
composer.json | 2 +-
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 bootstrap_barrio-handle_prefix_suffix-3128006-2.patch
diff --git a/bootstrap_barrio-handle_prefix_suffix-3128006-2.patch b/bootstrap_barrio-handle_prefix_suffix-3128006-2.patch
deleted file mode 100644
index 68d89eb..0000000
--- a/bootstrap_barrio-handle_prefix_suffix-3128006-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/templates/form/form-element.html.twig b/templates/form/form-element.html.twig
-index 9f40966..29edb1f 100644
---- a/templates/form/form-element.html.twig
-+++ b/templates/form/form-element.html.twig
-@@ -133,8 +133,13 @@
- {% if label_display in ['before', 'invisible'] %}
- {{ label }}
- {% endif %}
-+ {% if (prefix is not empty) or (suffix is not empty) %}
-+ <div class="input-group">
-+ {% endif %}
- {% if prefix is not empty %}
-- <span class="field-prefix">{{ prefix }}</span>
-+ <div class="input-group-prepend">
-+ <span class="field-prefix input-group-text">{{ prefix }}</span>
-+ </div>
- {% endif %}
- {% if description_display == 'before' and description.content %}
- <div{{ description.attributes }}>
-@@ -143,7 +148,12 @@
- {% endif %}
- {{ children }}
- {% if suffix is not empty %}
-- <span class="field-suffix">{{ suffix }}</span>
-+ <div class="input-group-append">
-+ <span class="field-suffix input-group-text">{{ suffix }}</span>
-+ </div>
-+ {% endif %}
-+ {% if (prefix is not empty) or (suffix is not empty) %}
-+ </div>
- {% endif %}
- {% if label_display == 'after' %}
- {{ label }}
diff --git a/composer.json b/composer.json
index 4efd90d..c9dcec5 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "drupal/bootstrap_barrio",
"description": "Bootstrap 4 base theme.",
"type": "drupal-theme",
- "license": "GPL-2.0",
+ "license": "GPL-2.0-or-later",
"homepage": "https://www.drupal.org/project/bootstrap_barrio",
"require": {
"twbs/bootstrap": "^4.4.1"
--
GitLab