From 96597bbe9ce148ca60a781c43fb4fe92c9ebd97b Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sat, 3 May 2014 23:35:30 -0700
Subject: [PATCH] Issue #2221041 by alexpott, sun | StuartJNCC: Color palette
setting controls are duplicated.
---
core/modules/color/lib/Drupal/color/Tests/ColorTest.php | 1 +
core/modules/color/templates/color-scheme-form.html.twig | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
index 6238019b33fe..79462bee904f 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
@@ -118,6 +118,7 @@ function _testColor($theme, $test_values) {
$this->drupalLogin($this->big_user);
$this->drupalGet($settings_path);
$this->assertResponse(200);
+ $this->assertUniqueText('Color set');
$edit['scheme'] = '';
$edit[$test_values['palette_input']] = '#123456';
$this->drupalPostForm($settings_path, $edit, t('Save configuration'));
diff --git a/core/modules/color/templates/color-scheme-form.html.twig b/core/modules/color/templates/color-scheme-form.html.twig
index 6cfacbd31e7a..694c6f726afa 100644
--- a/core/modules/color/templates/color-scheme-form.html.twig
+++ b/core/modules/color/templates/color-scheme-form.html.twig
@@ -20,7 +20,7 @@
<div id="palette" class="clearfix">
{{ form.palette }}
</div>
- {{ form }}
+ {{ form|without('scheme', 'palette') }}
<h2>{{ 'Preview'|t }}</h2>
{{ html_preview }}
</div>
--
GitLab