From 7a9a3cf5923f1389eb4ab717d0dafeb42ff8cfa5 Mon Sep 17 00:00:00 2001
From: Ashwin Narayanan <ashwin.narayanan@shopify.com>
Date: Tue, 8 Sep 2020 15:00:39 -0400
Subject: [PATCH 1/5] Added token for NDL searchbar background

---
 src/configs/base.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/configs/base.ts b/src/configs/base.ts
index 367e4c00..421b4167 100644
--- a/src/configs/base.ts
+++ b/src/configs/base.ts
@@ -208,6 +208,16 @@ export const config: Config = {
     },
   ],
   onSurface: [
+    {
+      name: 'background',
+      description:
+        'For use as a background color, in components such as TopBar SearchField.',
+      light: {lightness: 95.5},
+      dark: {lightness: 20},
+      meta: {
+        figmaName: 'Background/Default',
+      },
+    },
     {
       name: 'border',
       description: 'For use as the default border on elements.',

From 7492d43d0de39753bc075e7d19c861a729210a20 Mon Sep 17 00:00:00 2001
From: Ashwin Narayanan <ashwin.narayanan@shopify.com>
Date: Tue, 8 Sep 2020 15:08:22 -0400
Subject: [PATCH 2/5] Added changes to the Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a102c144..856ba46c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [2.12.5] - 2020-09-08
 
+- Added background under onSurface ([#146](https://github.com/Shopify/polaris-tokens/pull/146))
 - Updated borderSubdued and added borderShadow, borderShadowSubdued, and divider colors ([#145](https://github.com/Shopify/polaris-tokens/pull/145))
 
 ## [2.12.4] - 2020-08-27

From 750088c1501e0097daa40c98fa7de81e38ff3d3a Mon Sep 17 00:00:00 2001
From: Ashwin Narayanan <ashwin.narayanan@shopify.com>
Date: Tue, 8 Sep 2020 15:38:18 -0400
Subject: [PATCH 3/5] Changelog and description changes

---
 CHANGELOG.md        | 3 ++-
 src/configs/base.ts | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856ba46c..b6e24632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- Added background under onSurface ([#146](https://github.com/Shopify/polaris-tokens/pull/146))
+  
 ## [2.12.5] - 2020-09-08
 
-- Added background under onSurface ([#146](https://github.com/Shopify/polaris-tokens/pull/146))
 - Updated borderSubdued and added borderShadow, borderShadowSubdued, and divider colors ([#145](https://github.com/Shopify/polaris-tokens/pull/145))
 
 ## [2.12.4] - 2020-08-27
diff --git a/src/configs/base.ts b/src/configs/base.ts
index 421b4167..d2cdc6fe 100644
--- a/src/configs/base.ts
+++ b/src/configs/base.ts
@@ -210,8 +210,7 @@ export const config: Config = {
   onSurface: [
     {
       name: 'background',
-      description:
-        'For use as a background color, in components such as TopBar SearchField.',
+      description: 'For use as a background color on components',
       light: {lightness: 95.5},
       dark: {lightness: 20},
       meta: {

From d6c716cb0072dfe14d4e050254051f5dbe108e79 Mon Sep 17 00:00:00 2001
From: Ashwin Narayanan <ashwin.narayanan@shopify.com>
Date: Tue, 8 Sep 2020 15:57:38 -0400
Subject: [PATCH 4/5] Lint changes

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6e24632..9a431af3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 - Added background under onSurface ([#146](https://github.com/Shopify/polaris-tokens/pull/146))
-  
+
 ## [2.12.5] - 2020-09-08
 
 - Updated borderSubdued and added borderShadow, borderShadowSubdued, and divider colors ([#145](https://github.com/Shopify/polaris-tokens/pull/145))

From c0644cdba2e81d457cad434e6319dde23efdb29f Mon Sep 17 00:00:00 2001
From: Ashwin Narayanan <ashwin.narayanan@shopify.com>
Date: Wed, 9 Sep 2020 09:45:50 -0400
Subject: [PATCH 5/5] Content changes

---
 src/configs/base.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/configs/base.ts b/src/configs/base.ts
index d2cdc6fe..b0af0f0b 100644
--- a/src/configs/base.ts
+++ b/src/configs/base.ts
@@ -210,7 +210,8 @@ export const config: Config = {
   onSurface: [
     {
       name: 'background',
-      description: 'For use as a background color on components',
+      description:
+        'For use as a background color, in components on surface elements such as SearchField',
       light: {lightness: 95.5},
       dark: {lightness: 20},
       meta: {