From 4801c4a6f28d0f3b2f496b7de0f9d70818ee917a Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Thu, 21 May 2020 13:23:01 -0500
Subject: [PATCH] =?UTF-8?q?Issue=20#3137414=20by=20shaal,=20dww,=20G=C3=A1?=
=?UTF-8?q?bor=20Hojtsy,=20sja112,=20codersukanta,=20jungle,=20xjm,=20hest?=
=?UTF-8?q?enet,=20Dries:=20Remove=20D8=20branding=20from=20D9=20status=20?=
=?UTF-8?q?report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/COPYRIGHT.txt | 5 +++++
core/misc/logo/LICENSE.txt | 3 +++
core/misc/logo/drupal-logo.svg | 3 +++
.../css/components/system-status-report-general-info.css | 4 ++--
.../components/system-status-report-general-info.pcss.css | 4 ++--
core/themes/claro/images/core/cccccc/d8-logo.svg | 1 -
.../claro/templates/status-report-general-info.html.twig | 2 +-
.../css/components/system-status-report-general-info.css | 4 ++--
core/themes/seven/images/icons/cccccc/d8-logo.svg | 6 ------
.../seven/templates/status-report-general-info.html.twig | 2 +-
10 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 core/misc/logo/LICENSE.txt
create mode 100644 core/misc/logo/drupal-logo.svg
delete mode 100644 core/themes/claro/images/core/cccccc/d8-logo.svg
delete mode 100644 core/themes/seven/images/icons/cccccc/d8-logo.svg
diff --git a/core/COPYRIGHT.txt b/core/COPYRIGHT.txt
index 108e783ec60a..7db40ad2811b 100644
--- a/core/COPYRIGHT.txt
+++ b/core/COPYRIGHT.txt
@@ -57,3 +57,8 @@ PHP
Drupal depends on numerous PHP Composer packages. All Composer packages
retain the copyright of the authors.
+
+Brand materials
+
+ Drupal brand materials under core/misc/logo have a dedicated license. See
+ core/misc/logo/LICENSE.txt.
diff --git a/core/misc/logo/LICENSE.txt b/core/misc/logo/LICENSE.txt
new file mode 100644
index 000000000000..414da578e863
--- /dev/null
+++ b/core/misc/logo/LICENSE.txt
@@ -0,0 +1,3 @@
+The files in this directory are not covered by the GNU General Public License.
+See https://www.drupal.org/about/media-kit/copyright-and-trademark for the
+license terms of these Drupal brand materials.
diff --git a/core/misc/logo/drupal-logo.svg b/core/misc/logo/drupal-logo.svg
new file mode 100644
index 000000000000..bd2d4921a566
--- /dev/null
+++ b/core/misc/logo/drupal-logo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="drupal-logo" width="42.2" height="55.5" viewBox="0 0 42.2 55.5">
+ <path fill="#cccccc" d="M29.8,11.7C25.9,7.9,22.2,4.2,21.1,0c-1.1,4.2-4.8,7.9-8.7,11.7C6.6,17.5,0,24.1,0,34c-0.3,11.6,9,21.3,20.6,21.5 s21.3-9,21.5-20.6c0-0.3,0-0.6,0-0.9C42.2,24.1,35.6,17.5,29.8,11.7z M10.8,35.9c-0.6,0.8-1.2,1.7-1.6,2.6 c-0.1,0.1-0.2,0.3-0.4,0.3H8.7c-0.5,0-1-0.9-1-0.9l0,0c-0.1-0.2-0.3-0.5-0.4-0.7L7.2,37C5.9,34.2,7,30.3,7,30.3l0,0 c0.5-1.9,1.4-3.8,2.5-5.4c0.7-1,1.5-2,2.3-3l1,1l4.7,4.8c0.2,0.2,0.2,0.5,0,0.7l-4.9,5.5l0,0L10.8,35.9z M21.3,49.7 c-4,0-7.3-3.3-7.2-7.3c0-1.8,0.7-3.5,1.8-4.8c1.5-1.8,3.4-3.6,5.5-6c2.4,2.6,4,4.3,5.5,6.3c0.1,0.1,0.2,0.3,0.3,0.5 c0.8,1.2,1.3,2.6,1.3,4.1C28.6,46.5,25.3,49.7,21.3,49.7C21.3,49.7,21.3,49.7,21.3,49.7z M35,38.1L35,38.1 c-0.1,0.3-0.4,0.5-0.7,0.6h-0.1c-0.3-0.1-0.5-0.3-0.7-0.5l0,0c-1.3-1.9-2.7-3.7-4.3-5.3l-1.9-2l-6.4-6.6c-1.3-1.2-2.6-2.6-3.8-3.9 c0-0.1-0.1-0.1-0.1-0.1c-0.2-0.3-0.4-0.6-0.5-1c0-0.1,0-0.1,0-0.2c-0.2-1.1,0.2-2.2,1-3c1.2-1.2,2.5-2.5,3.7-3.8 c1.3,1.4,2.7,2.8,4.1,4.2l0,0c2.8,2.6,5.3,5.5,7.6,8.6c1.9,2.7,2.9,5.8,2.9,9.1C35.6,35.4,35.4,36.8,35,38.1z"/>
+</svg>
diff --git a/core/themes/claro/css/components/system-status-report-general-info.css b/core/themes/claro/css/components/system-status-report-general-info.css
index 31ac33a3b8b1..9d37611574b9 100644
--- a/core/themes/claro/css/components/system-status-report-general-info.css
+++ b/core/themes/claro/css/components/system-status-report-general-info.css
@@ -51,8 +51,8 @@
background-size: 35px;
}
-.system-status-general-info__item-icon--d8:before {
- background-image: url(../../images/core/cccccc/d8-logo.svg);
+.system-status-general-info__item-icon--drupal:before {
+ background-image: url(../../../../misc/logo/drupal-logo.svg);
}
.system-status-general-info__item-icon--clock:before {
diff --git a/core/themes/claro/css/components/system-status-report-general-info.pcss.css b/core/themes/claro/css/components/system-status-report-general-info.pcss.css
index 14cdb5dbe44d..4c5615f080e3 100644
--- a/core/themes/claro/css/components/system-status-report-general-info.pcss.css
+++ b/core/themes/claro/css/components/system-status-report-general-info.pcss.css
@@ -42,8 +42,8 @@
background-position: 50% center;
background-size: 35px;
}
-.system-status-general-info__item-icon--d8:before {
- background-image: url(../../images/core/cccccc/d8-logo.svg);
+.system-status-general-info__item-icon--drupal:before {
+ background-image: url(../../../../misc/logo/drupal-logo.svg);
}
.system-status-general-info__item-icon--clock:before {
background-image: url(../../images/core/cccccc/clock.svg);
diff --git a/core/themes/claro/images/core/cccccc/d8-logo.svg b/core/themes/claro/images/core/cccccc/d8-logo.svg
deleted file mode 100644
index e7402fd40594..000000000000
--- a/core/themes/claro/images/core/cccccc/d8-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="53.531" viewBox="0 0 47.411 53.531" width="47.411" xmlns="http://www.w3.org/2000/svg"><g fill="#ccc"><circle cx="22.308" cy="41.593" r="8.449"/><path d="m32.813 31.532c2.503 2.614 4.044 6.156 4.044 10.06 0 4.945-2.47 9.31-6.24 11.94 6.97-2.15 12.733-7.388 15.314-13.73 3.57-8.776.247-15.38-5.33-21.37.17.776.264 1.58.264 2.406 0 5.078-3.405 9.36-8.05 10.694z"/><circle cx="29.735" cy="20.838" r="6.463"/><path d="m11.178 50.96c-2.134-2.53-3.42-5.798-3.42-9.368 0-7.448 5.598-13.584 12.814-14.442-1.238-1.794-1.965-3.968-1.965-6.312 0-6.145 4.982-11.128 11.13-11.128.507 0 1.006.037 1.495.103-3.642-3.143-7.275-6.33-10.142-9.813 1.463 15.257-13.898 9.713-19.576 23.773-3.81 9.433-.376 21.095 9.663 27.188z"/></g></svg>
\ No newline at end of file
diff --git a/core/themes/claro/templates/status-report-general-info.html.twig b/core/themes/claro/templates/status-report-general-info.html.twig
index a5d6ce7bae0d..5dad25dd0a4e 100644
--- a/core/themes/claro/templates/status-report-general-info.html.twig
+++ b/core/themes/claro/templates/status-report-general-info.html.twig
@@ -33,7 +33,7 @@
<h2 class="system-status-general-info__header">{{ 'General System Information'|t }}</h2>
<div class="system-status-general-info__items">
<div class="system-status-general-info__item">
- <span class="system-status-general-info__item-icon system-status-general-info__item-icon--d8"></span>
+ <span class="system-status-general-info__item-icon system-status-general-info__item-icon--drupal"></span>
<div class="system-status-general-info__item-details">
<h3 class="system-status-general-info__item-title">{{ 'Drupal Version'|t }}</h3>
{{ drupal.value }}
diff --git a/core/themes/seven/css/components/system-status-report-general-info.css b/core/themes/seven/css/components/system-status-report-general-info.css
index 2746a1332a11..eca87714e3b5 100644
--- a/core/themes/seven/css/components/system-status-report-general-info.css
+++ b/core/themes/seven/css/components/system-status-report-general-info.css
@@ -42,8 +42,8 @@
background-position: 50% center;
background-size: 35px;
}
-.system-status-general-info__item-icon--d8:before {
- background-image: url(../../images/icons/cccccc/d8-logo.svg);
+.system-status-general-info__item-icon--drupal:before {
+ background-image: url(../../../../misc/logo/drupal-logo.svg);
}
.system-status-general-info__item-icon--clock:before {
background-image: url(../../images/icons/cccccc/clock.svg);
diff --git a/core/themes/seven/images/icons/cccccc/d8-logo.svg b/core/themes/seven/images/icons/cccccc/d8-logo.svg
deleted file mode 100644
index 035119bc76cd..000000000000
--- a/core/themes/seven/images/icons/cccccc/d8-logo.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="47.411" height="53.531" viewBox="0 0 47.411 53.531">
- <circle fill="#CCC" cx="22.308" cy="41.593" r="8.449"/>
- <path fill="#CCC" d="M32.813 31.532c2.503 2.614 4.044 6.156 4.044 10.06 0 4.945-2.47 9.31-6.24 11.94 6.97-2.15 12.733-7.388 15.314-13.73 3.57-8.776.247-15.38-5.33-21.37.17.776.264 1.58.264 2.406 0 5.078-3.405 9.36-8.05 10.694z"/>
- <circle fill="#CCC" cx="29.735" cy="20.838" r="6.463"/>
- <path fill="#CCC" d="M11.178 50.96c-2.134-2.53-3.42-5.798-3.42-9.368 0-7.448 5.598-13.584 12.814-14.442-1.238-1.794-1.965-3.968-1.965-6.312 0-6.145 4.982-11.128 11.13-11.128.507 0 1.006.037 1.495.103C27.59 6.67 23.957 3.483 21.09 0 22.553 15.257 7.192 9.713 1.514 23.773c-3.81 9.433-.376 21.095 9.663 27.188z"/>
-</svg>
diff --git a/core/themes/seven/templates/status-report-general-info.html.twig b/core/themes/seven/templates/status-report-general-info.html.twig
index a5d6ce7bae0d..5dad25dd0a4e 100644
--- a/core/themes/seven/templates/status-report-general-info.html.twig
+++ b/core/themes/seven/templates/status-report-general-info.html.twig
@@ -33,7 +33,7 @@
<h2 class="system-status-general-info__header">{{ 'General System Information'|t }}</h2>
<div class="system-status-general-info__items">
<div class="system-status-general-info__item">
- <span class="system-status-general-info__item-icon system-status-general-info__item-icon--d8"></span>
+ <span class="system-status-general-info__item-icon system-status-general-info__item-icon--drupal"></span>
<div class="system-status-general-info__item-details">
<h3 class="system-status-general-info__item-title">{{ 'Drupal Version'|t }}</h3>
{{ drupal.value }}
--
GitLab