From 9b7756f566590dc3929ec7a1757f5c3fcbb15efe Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 20 Aug 2021 10:18:05 -0600
Subject: [PATCH] Use singular names in theme and number surfaces from 0

---
 zed/assets/themes/_base.toml | 28 ++++++++++++++--------------
 zed/assets/themes/dark.toml  | 12 ++++++------
 zed/assets/themes/light.toml | 12 ++++++------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/zed/assets/themes/_base.toml b/zed/assets/themes/_base.toml
index 50a1b15e0c..a6663ec9c3 100644
--- a/zed/assets/themes/_base.toml
+++ b/zed/assets/themes/_base.toml
@@ -1,9 +1,9 @@
 [ui]
-background = "$surfaces.1"
+background = "$surface.0"
 
 [ui.tab]
-background = "$surfaces.2"
-text = "$text_colors.dull"
+background = "$surface.1"
+text = "$text_color.dull"
 border = { color = "#000000", width = 1.0 }
 padding = { left = 10, right = 10 }
 icon_close = "#383839"
@@ -12,12 +12,12 @@ icon_conflict = "#e45349"
 
 [ui.active_tab]
 extends = "$ui.tab"
-background = "$surfaces.3"
-text = "$text_colors.bright"
+background = "$surface.2"
+text = "$text_color.bright"
 
 [ui.selector]
-background = "$surfaces.4"
-text = "$text_colors.bright"
+background = "$surface.3"
+text = "$text_color.bright"
 padding = { top = 6.0, bottom = 6.0, left = 6.0, right = 6.0 }
 margin.top = 12.0
 corner_radius = 6.0
@@ -35,13 +35,13 @@ extends = "$ui.selector.item"
 background = "#094771"
 
 [editor]
-background = "$surfaces.3"
-gutter_background = "$surfaces.3"
-active_line_background = "$surfaces.4"
-line_number = "$text_colors.dull"
-line_number_active = "$text_colors.bright"
-text = "$text_colors.normal"
+background = "$surface.2"
+gutter_background = "$surface.2"
+active_line_background = "$surface.3"
+line_number = "$text_color.dull"
+line_number_active = "$text_color.bright"
+text = "$text_color.normal"
 replicas = [
-    { selection = "#264f78", cursor = "$text_colors.bright" },
+    { selection = "#264f78", cursor = "$text_color.bright" },
     { selection = "#504f31", cursor = "#fcf154" },
 ]
diff --git a/zed/assets/themes/dark.toml b/zed/assets/themes/dark.toml
index 58872cc759..2bbd37e934 100644
--- a/zed/assets/themes/dark.toml
+++ b/zed/assets/themes/dark.toml
@@ -1,12 +1,12 @@
 extends = "_base"
 
-[surfaces]
-1 = "#050101"
-2 = "#131415"
-3 = "#1c1d1e"
-4 = "#3a3b3c"
+[surface]
+0 = "#050101"
+1 = "#131415"
+2 = "#1c1d1e"
+3 = "#3a3b3c"
 
-[text_colors]
+[text_color]
 dull = "#5a5a5b"
 bright = "#ffffff"
 normal = "#d4d4d4"
diff --git a/zed/assets/themes/light.toml b/zed/assets/themes/light.toml
index 1cdb2c51dd..c384e27f27 100644
--- a/zed/assets/themes/light.toml
+++ b/zed/assets/themes/light.toml
@@ -1,12 +1,12 @@
 extends = "_base"
 
-[surfaces]
-1 = "#ffffff"
-2 = "#f3f3f3"
-3 = "#ececec"
-4 = "#3a3b3c"
+[surface]
+0 = "#ffffff"
+1 = "#f3f3f3"
+2 = "#ececec"
+3 = "#3a3b3c"
 
-[text_colors]
+[text_color]
 dull = "#acacac"
 bright = "#111111"
 normal = "#333333"