v0.31.1

Merge pull request #965 from zed-industries/avatar-margin
Parameterize `avatar_margin` and assign it a default of 8
2022-05-03 18:21:02 +02:00 · 2022-05-03 18:20:50 +02:00 · 2022-05-03 18:20:40 +02:00 · 2022-05-03 18:20:31 +02:00
19 changed files with 476 additions and 486 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5538,7 +5538,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"

 [[package]]
 name = "zed"
-version = "0.30.0"
+version = "0.31.1"
 dependencies = [
 "anyhow",
 "assets",
--- a/assets/themes/cave-dark.json
+++ b/assets/themes/cave-dark.json
@@ -23,7 +23,7 @@
        "size": 14
      },
      "active": {
-        "background": "#5852607a",
+        "background": "#5852605c",
        "text": {
          "family": "Zed Sans",
          "color": "#e2dfe7",
@@ -31,7 +31,7 @@
        }
      },
      "hover": {
-        "background": "#58526052"
+        "background": "#5852603d"
      }
    },
    "border": {
@@ -81,7 +81,7 @@
    },
    "shadow": {
      "blur": 16,
-      "color": "#00000052",
+      "color": "#0000003d",
      "offset": [
        0,
        2
@@ -215,7 +215,7 @@
            "size": 14
          },
          "icon_color": "#e2dfe7",
-          "background": "#58526052"
+          "background": "#5852603d"
        }
      },
      "diagnostic_message": {
@@ -288,7 +288,7 @@
              "left": 7,
              "right": 7
            },
-            "background": "#58526052"
+            "background": "#5852603d"
          },
          "container_warning": {
            "corner_radius": 6,
@@ -335,21 +335,23 @@
          "icon_color": "#8b8792",
          "hover": {
            "icon_color": "#e2dfe7",
-            "background": "#58526052"
+            "background": "#5852603d"
          },
          "active": {
            "icon_color": "#efecf4",
-            "background": "#5852607a"
+            "background": "#5852605c"
          }
        }
      }
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#26232a",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,19 +408,20 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#8b8792",
        "hover": {
-          "background": "#58526052",
+          "background": "#5852603d",
          "color": "#8b8792"
        },
        "active": {
-          "background": "#5852607a",
+          "background": "#5852605c",
          "color": "#efecf4"
        },
        "active_hover": {
-          "background": "#58526052",
+          "background": "#5852603d",
          "color": "#efecf4"
        }
      },
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#8b8792",
    "diff_background_deleted": "#be467826",
    "diff_background_inserted": "#2a929226",
-    "document_highlight_read_background": "#19171c1f",
-    "document_highlight_write_background": "#19171c29",
+    "document_highlight_read_background": "#efecf41f",
+    "document_highlight_write_background": "#efecf43d",
    "error_color": "#be4678",
    "gutter_background": "#19171c",
    "gutter_padding_factor": 3.5,
@@ -549,7 +548,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#26232a52"
+        "background": "#26232a3d"
      },
      "margin": {
        "left": -14
@@ -567,7 +566,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#26232a7a"
+        "background": "#26232a5c"
      }
    },
    "diagnostic_header": {
@@ -951,7 +950,7 @@
    },
    "hovered_entry": {
      "height": 24,
-      "background": "#58526052",
+      "background": "#5852603d",
      "icon_color": "#8b8792",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -974,7 +973,7 @@
    },
    "hovered_selected_entry": {
      "height": 24,
-      "background": "#58526052",
+      "background": "#5852603d",
      "icon_color": "#8b8792",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -1059,7 +1058,7 @@
            "right": 8
          }
        },
-        "background": "#58526052",
+        "background": "#5852603d",
        "corner_radius": 6
      },
      "active_item": {
@@ -1094,7 +1093,7 @@
            "right": 8
          }
        },
-        "background": "#58526052",
+        "background": "#5852603d",
        "corner_radius": 6
      },
      "menu": {
@@ -1107,7 +1106,7 @@
        },
        "shadow": {
          "blur": 16,
-          "color": "#00000052",
+          "color": "#0000003d",
          "offset": [
            0,
            2
@@ -1284,7 +1283,7 @@
      "padding": {
        "left": 8
      },
-      "background": "#58526052",
+      "background": "#5852603d",
      "corner_radius": 6
    },
    "unshared_project": {
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#955ae780",
+    "match_background": "#955ae77a",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
@@ -1354,7 +1353,7 @@
        "family": "Zed Mono",
        "color": "#efecf4",
        "size": 14,
-        "background": "#585260a3",
+        "background": "#5852607a",
        "border": {
          "color": "#655f6d",
          "width": 1
@@ -1364,7 +1363,7 @@
        "family": "Zed Mono",
        "color": "#efecf4",
        "size": 14,
-        "background": "#58526052",
+        "background": "#5852603d",
        "border": {
          "color": "#655f6d",
          "width": 1
--- a/assets/themes/cave-light.json
+++ b/assets/themes/cave-light.json
@@ -346,10 +346,12 @@
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#e2dfe7",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,7 +408,8 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#585260",
        "hover": {
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#585260",
    "diff_background_deleted": "#be467826",
    "diff_background_inserted": "#2a929226",
-    "document_highlight_read_background": "#efecf41f",
-    "document_highlight_write_background": "#efecf429",
+    "document_highlight_read_background": "#19171c0f",
+    "document_highlight_write_background": "#19171c1f",
    "error_color": "#be4678",
    "gutter_background": "#efecf4",
    "gutter_padding_factor": 3.5,
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#955ae780",
+    "match_background": "#955ae73d",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
--- a/assets/themes/dark.json
+++ b/assets/themes/dark.json
@@ -346,10 +346,12 @@
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#2b2b2b",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,7 +408,8 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#9c9c9c",
        "hover": {
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
--- a/assets/themes/light.json
+++ b/assets/themes/light.json
@@ -346,10 +346,12 @@
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#eaeaea",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,7 +408,8 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#717171",
        "hover": {
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
--- a/assets/themes/solarized-dark.json
+++ b/assets/themes/solarized-dark.json
@@ -23,7 +23,7 @@
        "size": 14
      },
      "active": {
-        "background": "#586e757a",
+        "background": "#586e755c",
        "text": {
          "family": "Zed Sans",
          "color": "#eee8d5",
@@ -31,7 +31,7 @@
        }
      },
      "hover": {
-        "background": "#586e7552"
+        "background": "#586e753d"
      }
    },
    "border": {
@@ -81,7 +81,7 @@
    },
    "shadow": {
      "blur": 16,
-      "color": "#00000052",
+      "color": "#0000003d",
      "offset": [
        0,
        2
@@ -215,7 +215,7 @@
            "size": 14
          },
          "icon_color": "#eee8d5",
-          "background": "#586e7552"
+          "background": "#586e753d"
        }
      },
      "diagnostic_message": {
@@ -288,7 +288,7 @@
              "left": 7,
              "right": 7
            },
-            "background": "#586e7552"
+            "background": "#586e753d"
          },
          "container_warning": {
            "corner_radius": 6,
@@ -335,21 +335,23 @@
          "icon_color": "#93a1a1",
          "hover": {
            "icon_color": "#eee8d5",
-            "background": "#586e7552"
+            "background": "#586e753d"
          },
          "active": {
            "icon_color": "#fdf6e3",
-            "background": "#586e757a"
+            "background": "#586e755c"
          }
        }
      }
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#073642",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,19 +408,20 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#93a1a1",
        "hover": {
-          "background": "#586e7552",
+          "background": "#586e753d",
          "color": "#93a1a1"
        },
        "active": {
-          "background": "#586e757a",
+          "background": "#586e755c",
          "color": "#fdf6e3"
        },
        "active_hover": {
-          "background": "#586e7552",
+          "background": "#586e753d",
          "color": "#fdf6e3"
        }
      },
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#93a1a1",
    "diff_background_deleted": "#dc322f26",
    "diff_background_inserted": "#85990026",
-    "document_highlight_read_background": "#002b361f",
-    "document_highlight_write_background": "#002b3629",
+    "document_highlight_read_background": "#fdf6e31f",
+    "document_highlight_write_background": "#fdf6e33d",
    "error_color": "#dc322f",
    "gutter_background": "#002b36",
    "gutter_padding_factor": 3.5,
@@ -549,7 +548,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#07364252"
+        "background": "#0736423d"
      },
      "margin": {
        "left": -14
@@ -567,7 +566,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#0736427a"
+        "background": "#0736425c"
      }
    },
    "diagnostic_header": {
@@ -951,7 +950,7 @@
    },
    "hovered_entry": {
      "height": 24,
-      "background": "#586e7552",
+      "background": "#586e753d",
      "icon_color": "#93a1a1",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -974,7 +973,7 @@
    },
    "hovered_selected_entry": {
      "height": 24,
-      "background": "#586e7552",
+      "background": "#586e753d",
      "icon_color": "#93a1a1",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -1059,7 +1058,7 @@
            "right": 8
          }
        },
-        "background": "#586e7552",
+        "background": "#586e753d",
        "corner_radius": 6
      },
      "active_item": {
@@ -1094,7 +1093,7 @@
            "right": 8
          }
        },
-        "background": "#586e7552",
+        "background": "#586e753d",
        "corner_radius": 6
      },
      "menu": {
@@ -1107,7 +1106,7 @@
        },
        "shadow": {
          "blur": 16,
-          "color": "#00000052",
+          "color": "#0000003d",
          "offset": [
            0,
            2
@@ -1284,7 +1283,7 @@
      "padding": {
        "left": 8
      },
-      "background": "#586e7552",
+      "background": "#586e753d",
      "corner_radius": 6
    },
    "unshared_project": {
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#6c71c480",
+    "match_background": "#6c71c47a",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
@@ -1354,7 +1353,7 @@
        "family": "Zed Mono",
        "color": "#fdf6e3",
        "size": 14,
-        "background": "#586e75a3",
+        "background": "#586e757a",
        "border": {
          "color": "#657b83",
          "width": 1
@@ -1364,7 +1363,7 @@
        "family": "Zed Mono",
        "color": "#fdf6e3",
        "size": 14,
-        "background": "#586e7552",
+        "background": "#586e753d",
        "border": {
          "color": "#657b83",
          "width": 1
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -346,10 +346,12 @@
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#eee8d5",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,7 +408,8 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#586e75",
        "hover": {
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#586e75",
    "diff_background_deleted": "#dc322f26",
    "diff_background_inserted": "#85990026",
-    "document_highlight_read_background": "#fdf6e31f",
-    "document_highlight_write_background": "#fdf6e329",
+    "document_highlight_read_background": "#002b360f",
+    "document_highlight_write_background": "#002b361f",
    "error_color": "#dc322f",
    "gutter_background": "#fdf6e3",
    "gutter_padding_factor": 3.5,
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#6c71c480",
+    "match_background": "#6c71c43d",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
--- a/assets/themes/sulphurpool-dark.json
+++ b/assets/themes/sulphurpool-dark.json
@@ -23,7 +23,7 @@
        "size": 14
      },
      "active": {
-        "background": "#5e66877a",
+        "background": "#5e66875c",
        "text": {
          "family": "Zed Sans",
          "color": "#dfe2f1",
@@ -31,7 +31,7 @@
        }
      },
      "hover": {
-        "background": "#5e668752"
+        "background": "#5e66873d"
      }
    },
    "border": {
@@ -81,7 +81,7 @@
    },
    "shadow": {
      "blur": 16,
-      "color": "#00000052",
+      "color": "#0000003d",
      "offset": [
        0,
        2
@@ -215,7 +215,7 @@
            "size": 14
          },
          "icon_color": "#dfe2f1",
-          "background": "#5e668752"
+          "background": "#5e66873d"
        }
      },
      "diagnostic_message": {
@@ -288,7 +288,7 @@
              "left": 7,
              "right": 7
            },
-            "background": "#5e668752"
+            "background": "#5e66873d"
          },
          "container_warning": {
            "corner_radius": 6,
@@ -335,21 +335,23 @@
          "icon_color": "#979db4",
          "hover": {
            "icon_color": "#dfe2f1",
-            "background": "#5e668752"
+            "background": "#5e66873d"
          },
          "active": {
            "icon_color": "#f5f7ff",
-            "background": "#5e66877a"
+            "background": "#5e66875c"
          }
        }
      }
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#293256",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,19 +408,20 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#979db4",
        "hover": {
-          "background": "#5e668752",
+          "background": "#5e66873d",
          "color": "#979db4"
        },
        "active": {
-          "background": "#5e66877a",
+          "background": "#5e66875c",
          "color": "#f5f7ff"
        },
        "active_hover": {
-          "background": "#5e668752",
+          "background": "#5e66873d",
          "color": "#f5f7ff"
        }
      },
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#979db4",
    "diff_background_deleted": "#c9492226",
    "diff_background_inserted": "#ac973926",
-    "document_highlight_read_background": "#2027461f",
-    "document_highlight_write_background": "#20274629",
+    "document_highlight_read_background": "#f5f7ff1f",
+    "document_highlight_write_background": "#f5f7ff3d",
    "error_color": "#c94922",
    "gutter_background": "#202746",
    "gutter_padding_factor": 3.5,
@@ -549,7 +548,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#29325652"
+        "background": "#2932563d"
      },
      "margin": {
        "left": -14
@@ -567,7 +566,7 @@
          "right": 6,
          "top": 2
        },
-        "background": "#2932567a"
+        "background": "#2932565c"
      }
    },
    "diagnostic_header": {
@@ -951,7 +950,7 @@
    },
    "hovered_entry": {
      "height": 24,
-      "background": "#5e668752",
+      "background": "#5e66873d",
      "icon_color": "#979db4",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -974,7 +973,7 @@
    },
    "hovered_selected_entry": {
      "height": 24,
-      "background": "#5e668752",
+      "background": "#5e66873d",
      "icon_color": "#979db4",
      "icon_size": 8,
      "icon_spacing": 8,
@@ -1059,7 +1058,7 @@
            "right": 8
          }
        },
-        "background": "#5e668752",
+        "background": "#5e66873d",
        "corner_radius": 6
      },
      "active_item": {
@@ -1094,7 +1093,7 @@
            "right": 8
          }
        },
-        "background": "#5e668752",
+        "background": "#5e66873d",
        "corner_radius": 6
      },
      "menu": {
@@ -1107,7 +1106,7 @@
        },
        "shadow": {
          "blur": 16,
-          "color": "#00000052",
+          "color": "#0000003d",
          "offset": [
            0,
            2
@@ -1284,7 +1283,7 @@
      "padding": {
        "left": 8
      },
-      "background": "#5e668752",
+      "background": "#5e66873d",
      "corner_radius": 6
    },
    "unshared_project": {
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#6679cc80",
+    "match_background": "#6679cc7a",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
@@ -1354,7 +1353,7 @@
        "family": "Zed Mono",
        "color": "#f5f7ff",
        "size": 14,
-        "background": "#5e6687a3",
+        "background": "#5e66877a",
        "border": {
          "color": "#6b7394",
          "width": 1
@@ -1364,7 +1363,7 @@
        "family": "Zed Mono",
        "color": "#f5f7ff",
        "size": 14,
-        "background": "#5e668752",
+        "background": "#5e66873d",
        "border": {
          "color": "#6b7394",
          "width": 1
--- a/assets/themes/sulphurpool-light.json
+++ b/assets/themes/sulphurpool-light.json
@@ -346,10 +346,12 @@
    },
    "titlebar": {
      "avatar_width": 18,
+      "avatar_margin": 8,
      "height": 33,
      "background": "#dfe2f1",
      "padding": {
-        "left": 80
+        "left": 80,
+        "right": 6
      },
      "title": {
        "family": "Zed Sans",
@@ -380,8 +382,7 @@
        },
        "corner_radius": 6,
        "margin": {
-          "top": 1,
-          "right": 6
+          "top": 1
        },
        "padding": {
          "left": 6,
@@ -407,7 +408,8 @@
        "corner_radius": 6,
        "margin": {
          "top": 3,
-          "bottom": 2
+          "bottom": 2,
+          "left": 6
        },
        "color": "#5e6687",
        "hover": {
@@ -436,10 +438,7 @@
          "left": 6,
          "right": 6
        },
-        "corner_radius": 6,
-        "margin": {
-          "right": 6
-        }
+        "corner_radius": 6
      }
    },
    "toolbar": {
@@ -480,8 +479,8 @@
    "code_actions_indicator": "#5e6687",
    "diff_background_deleted": "#c9492226",
    "diff_background_inserted": "#ac973926",
-    "document_highlight_read_background": "#f5f7ff1f",
-    "document_highlight_write_background": "#f5f7ff29",
+    "document_highlight_read_background": "#2027460f",
+    "document_highlight_write_background": "#2027461f",
    "error_color": "#c94922",
    "gutter_background": "#f5f7ff",
    "gutter_padding_factor": 3.5,
@@ -1328,7 +1327,7 @@
    }
  },
  "search": {
-    "match_background": "#6679cc80",
+    "match_background": "#6679cc3d",
    "tab_icon_spacing": 8,
    "tab_icon_width": 14,
    "option_button": {
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -53,6 +53,7 @@ pub struct Titlebar {
    pub height: f32,
    pub title: TextStyle,
    pub avatar_width: f32,
+    pub avatar_margin: f32,
    pub avatar_ribbon: AvatarRibbon,
    pub offline_icon: OfflineIcon,
    pub share_icon: Interactive<ShareIcon>,
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1629,7 +1629,7 @@ impl Workspace {
            .constrained()
            .with_width(theme.workspace.titlebar.avatar_width)
            .contained()
-            .with_margin_left(2.)
+            .with_margin_left(theme.workspace.titlebar.avatar_margin)
            .boxed();

        if let Some(peer_id) = peer_id {
@@ -1664,9 +1664,6 @@ impl Workspace {
                        .constrained()
                        .with_width(24.)
                        .aligned()
-                        .constrained()
-                        .with_width(24.)
-                        .aligned()
                        .boxed()
                })
                .with_cursor_style(CursorStyle::PointingHand)
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.31.0"
+version = "0.31.1"

 [lib]
 name = "zed"
--- a/styles/dist/dark.json
+++ b/styles/dist/dark.json
@@ -219,88 +219,88 @@
    },
    "ok": {
      "base": {
-        "value": "#1b9447",
+        "value": "#1b944726",
        "description": "Step: 600",
        "type": "color"
      },
      "hovered": {
-        "value": "#1b9447",
+        "value": "#1b944733",
        "description": "Step: 600",
        "type": "color"
      },
      "active": {
-        "value": "#1b9447",
+        "value": "#1b944740",
        "description": "Step: 600",
        "type": "color"
      },
      "focused": {
-        "value": "#1b9447",
+        "value": "#1b944733",
        "description": "Step: 600",
        "type": "color"
      }
    },
    "error": {
      "base": {
-        "value": "#f15656",
-        "description": "Step: 400",
+        "value": "#c9181826",
+        "description": "Step: 600",
        "type": "color"
      },
      "hovered": {
-        "value": "#f15656",
-        "description": "Step: 400",
+        "value": "#c9181833",
+        "description": "Step: 600",
        "type": "color"
      },
      "active": {
-        "value": "#f15656",
-        "description": "Step: 400",
+        "value": "#c9181840",
+        "description": "Step: 600",
        "type": "color"
      },
      "focused": {
-        "value": "#f15656",
-        "description": "Step: 400",
+        "value": "#c9181833",
+        "description": "Step: 600",
        "type": "color"
      }
    },
    "warning": {
      "base": {
-        "value": "#f7bb57",
-        "description": "Step: 300",
+        "value": "#f6a72426",
+        "description": "Step: 400",
        "type": "color"
      },
      "hovered": {
-        "value": "#f7bb57",
-        "description": "Step: 300",
+        "value": "#f6a72433",
+        "description": "Step: 400",
        "type": "color"
      },
      "active": {
-        "value": "#f7bb57",
-        "description": "Step: 300",
+        "value": "#f6a72440",
+        "description": "Step: 400",
        "type": "color"
      },
      "focused": {
-        "value": "#f7bb57",
-        "description": "Step: 300",
+        "value": "#f6a72433",
+        "description": "Step: 400",
        "type": "color"
      }
    },
    "info": {
      "base": {
-        "value": "#2472f2",
+        "value": "#2472f226",
        "description": "Step: 500",
        "type": "color"
      },
      "hovered": {
-        "value": "#2472f2",
+        "value": "#2472f233",
        "description": "Step: 500",
        "type": "color"
      },
      "active": {
-        "value": "#2472f2",
+        "value": "#2472f240",
        "description": "Step: 500",
        "type": "color"
      },
      "focused": {
-        "value": "#2472f2",
+        "value": "#2472f233",
        "description": "Step: 500",
        "type": "color"
      }
@@ -333,22 +333,22 @@
      "type": "color"
    },
    "ok": {
-      "value": "#20b456",
-      "description": "Step: 500",
+      "value": "#1b944726",
+      "description": "Step: 600",
      "type": "color"
    },
    "error": {
-      "value": "#eb2d2d",
+      "value": "#eb2d2d26",
      "description": "Step: 500",
      "type": "color"
    },
    "warning": {
-      "value": "#de900c",
-      "description": "Step: 500",
+      "value": "#f6a72426",
+      "description": "Step: 400",
      "type": "color"
    },
    "info": {
-      "value": "#2472f2",
+      "value": "#2472f226",
      "description": "Step: 500",
      "type": "color"
    }
@@ -381,17 +381,17 @@
        "type": "color"
      },
      "inserted": {
-        "value": "#1b9447",
+        "value": "#1b944740",
        "description": "Step: 600",
        "type": "color"
      },
      "deleted": {
-        "value": "#f15656",
-        "description": "Step: 400",
+        "value": "#c9181840",
+        "description": "Step: 600",
        "type": "color"
      },
      "modified": {
-        "value": "#2472f2",
+        "value": "#2472f240",
        "description": "Step: 500",
        "type": "color"
      }
--- a/styles/dist/light.json
+++ b/styles/dist/light.json
@@ -219,89 +219,89 @@
    },
    "ok": {
      "base": {
-        "value": "#b7f9ce",
-        "description": "Step: 100",
+        "value": "#1b944726",
+        "description": "Step: 600",
        "type": "color"
      },
      "hovered": {
-        "value": "#b7f9ce",
-        "description": "Step: 100",
+        "value": "#1b944733",
+        "description": "Step: 600",
        "type": "color"
      },
      "active": {
-        "value": "#b7f9ce",
-        "description": "Step: 100",
+        "value": "#1b944740",
+        "description": "Step: 600",
        "type": "color"
      },
      "focused": {
-        "value": "#b7f9ce",
-        "description": "Step: 100",
+        "value": "#1b944733",
+        "description": "Step: 600",
        "type": "color"
      }
    },
    "error": {
      "base": {
-        "value": "#fcc6c6",
-        "description": "Step: 100",
+        "value": "#c9181826",
+        "description": "Step: 600",
        "type": "color"
      },
      "hovered": {
-        "value": "#fcc6c6",
-        "description": "Step: 100",
+        "value": "#c9181833",
+        "description": "Step: 600",
        "type": "color"
      },
      "active": {
-        "value": "#fcc6c6",
-        "description": "Step: 100",
+        "value": "#c9181840",
+        "description": "Step: 600",
        "type": "color"
      },
      "focused": {
-        "value": "#fcc6c6",
-        "description": "Step: 100",
+        "value": "#c9181833",
+        "description": "Step: 600",
        "type": "color"
      }
    },
    "warning": {
      "base": {
-        "value": "#fce9b7",
-        "description": "Step: 100",
+        "value": "#f6a72426",
+        "description": "Step: 400",
        "type": "color"
      },
      "hovered": {
-        "value": "#fce9b7",
-        "description": "Step: 100",
+        "value": "#f6a72433",
+        "description": "Step: 400",
        "type": "color"
      },
      "active": {
-        "value": "#fce9b7",
-        "description": "Step: 100",
+        "value": "#f6a72440",
+        "description": "Step: 400",
        "type": "color"
      },
      "focused": {
-        "value": "#fce9b7",
-        "description": "Step: 100",
+        "value": "#f6a72433",
+        "description": "Step: 400",
        "type": "color"
      }
    },
    "info": {
      "base": {
-        "value": "#c5dafc",
-        "description": "Step: 100",
+        "value": "#2472f226",
+        "description": "Step: 500",
        "type": "color"
      },
      "hovered": {
-        "value": "#c5dafc",
-        "description": "Step: 100",
+        "value": "#2472f233",
+        "description": "Step: 500",
        "type": "color"
      },
      "active": {
-        "value": "#c5dafc",
-        "description": "Step: 100",
+        "value": "#2472f240",
+        "description": "Step: 500",
        "type": "color"
      },
      "focused": {
-        "value": "#c5dafc",
-        "description": "Step: 100",
+        "value": "#2472f233",
+        "description": "Step: 500",
        "type": "color"
      }
    }
@@ -333,23 +333,23 @@
      "type": "color"
    },
    "ok": {
-      "value": "#84f2ab",
-      "description": "Step: 200",
+      "value": "#1b944726",
+      "description": "Step: 600",
      "type": "color"
    },
    "error": {
-      "value": "#f9a0a0",
-      "description": "Step: 200",
+      "value": "#eb2d2d26",
+      "description": "Step: 500",
      "type": "color"
    },
    "warning": {
-      "value": "#f9da82",
-      "description": "Step: 200",
+      "value": "#f6a72426",
+      "description": "Step: 400",
      "type": "color"
    },
    "info": {
-      "value": "#9ec1fa",
-      "description": "Step: 200",
+      "value": "#2472f226",
+      "description": "Step: 500",
      "type": "color"
    }
  },
@@ -381,18 +381,18 @@
        "type": "color"
      },
      "inserted": {
-        "value": "#b7f9ce",
-        "description": "Step: 100",
+        "value": "#1b944740",
+        "description": "Step: 600",
        "type": "color"
      },
      "deleted": {
-        "value": "#fcc6c6",
-        "description": "Step: 100",
+        "value": "#c9181840",
+        "description": "Step: 600",
        "type": "color"
      },
      "modified": {
-        "value": "#c5dafc",
-        "description": "Step: 100",
+        "value": "#2472f240",
+        "description": "Step: 500",
        "type": "color"
      }
    },
--- a/styles/dist/solarized-dark.json
+++ b/styles/dist/solarized-dark.json
@@ -93,15 +93,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#586e7552",
+        "value": "#586e753d",
        "type": "color"
      },
      "active": {
-        "value": "#586e757a",
+        "value": "#586e755c",
        "type": "color"
      },
      "focused": {
-        "value": "#586e75",
+        "value": "#586e753d",
        "type": "color"
      }
    },
@@ -111,15 +111,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#586e7552",
+        "value": "#586e753d",
        "type": "color"
      },
      "active": {
-        "value": "#586e757a",
+        "value": "#586e755c",
        "type": "color"
      },
      "focused": {
-        "value": "#586e75",
+        "value": "#586e753d",
        "type": "color"
      }
    },
@@ -129,15 +129,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#073642",
+        "value": "#0736423d",
        "type": "color"
      },
      "active": {
-        "value": "#073642",
+        "value": "#0736425c",
        "type": "color"
      },
      "focused": {
-        "value": "#073642",
+        "value": "#0736423d",
        "type": "color"
      }
    },
@@ -147,15 +147,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#073642",
+        "value": "#0736423d",
        "type": "color"
      },
      "active": {
-        "value": "#073642",
+        "value": "#0736427a",
        "type": "color"
      },
      "focused": {
-        "value": "#073642",
+        "value": "#0736423d",
        "type": "color"
      }
    },
@@ -165,87 +165,87 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#657b83",
+        "value": "#586e753d",
        "type": "color"
      },
      "active": {
-        "value": "#657b83",
+        "value": "#586e757a",
        "type": "color"
      },
      "focused": {
-        "value": "#657b83",
+        "value": "#586e753d",
        "type": "color"
      }
    },
    "ok": {
      "base": {
-        "value": "#859900",
+        "value": "#85990026",
        "type": "color"
      },
      "hovered": {
-        "value": "#859900",
+        "value": "#85990033",
        "type": "color"
      },
      "active": {
-        "value": "#859900",
+        "value": "#85990040",
        "type": "color"
      },
      "focused": {
-        "value": "#859900",
+        "value": "#85990033",
        "type": "color"
      }
    },
    "error": {
      "base": {
-        "value": "#dc322f",
+        "value": "#dc322f26",
        "type": "color"
      },
      "hovered": {
-        "value": "#dc322f",
+        "value": "#dc322f33",
        "type": "color"
      },
      "active": {
-        "value": "#dc322f",
+        "value": "#dc322f40",
        "type": "color"
      },
      "focused": {
-        "value": "#dc322f",
+        "value": "#dc322f33",
        "type": "color"
      }
    },
    "warning": {
      "base": {
-        "value": "#b58900",
+        "value": "#b5890026",
        "type": "color"
      },
      "hovered": {
-        "value": "#b58900",
+        "value": "#b5890033",
        "type": "color"
      },
      "active": {
-        "value": "#b58900",
+        "value": "#b5890040",
        "type": "color"
      },
      "focused": {
-        "value": "#b58900",
+        "value": "#b5890033",
        "type": "color"
      }
    },
    "info": {
      "base": {
-        "value": "#268bd2",
+        "value": "#268bd226",
        "type": "color"
      },
      "hovered": {
-        "value": "#268bd2",
+        "value": "#268bd233",
        "type": "color"
      },
      "active": {
-        "value": "#268bd2",
+        "value": "#268bd240",
        "type": "color"
      },
      "focused": {
-        "value": "#268bd2",
+        "value": "#268bd233",
        "type": "color"
      }
    }
@@ -272,19 +272,19 @@
      "type": "color"
    },
    "ok": {
-      "value": "#859900",
+      "value": "#85990026",
      "type": "color"
    },
    "error": {
-      "value": "#dc322f",
+      "value": "#dc322f26",
      "type": "color"
    },
    "warning": {
-      "value": "#b58900",
+      "value": "#b5890026",
      "type": "color"
    },
    "info": {
-      "value": "#268bd2",
+      "value": "#268bd226",
      "type": "color"
    }
  },
@@ -311,15 +311,15 @@
        "type": "color"
      },
      "inserted": {
-        "value": "#859900",
+        "value": "#85990040",
        "type": "color"
      },
      "deleted": {
-        "value": "#dc322f",
+        "value": "#dc322f40",
        "type": "color"
      },
      "modified": {
-        "value": "#268bd2",
+        "value": "#268bd240",
        "type": "color"
      }
    },
@@ -329,27 +329,27 @@
        "type": "color"
      },
      "occurrence": {
-        "value": "#002b361f",
+        "value": "#fdf6e31f",
        "type": "color"
      },
      "activeOccurrence": {
-        "value": "#002b3629",
+        "value": "#fdf6e33d",
        "type": "color"
      },
      "matchingBracket": {
-        "value": "#073642",
+        "value": "#0736425c",
        "type": "color"
      },
      "match": {
-        "value": "#6c71c480",
+        "value": "#6c71c47a",
        "type": "color"
      },
      "activeMatch": {
-        "value": "#6c71c4b3",
+        "value": "#6c71c4b8",
        "type": "color"
      },
      "related": {
-        "value": "#073642",
+        "value": "#0736423d",
        "type": "color"
      }
    },
@@ -561,7 +561,7 @@
    }
  },
  "shadowAlpha": {
-    "value": 0.32,
+    "value": 0.24,
    "type": "number"
  }
 }
--- a/styles/dist/solarized-light.json
+++ b/styles/dist/solarized-light.json
@@ -101,7 +101,7 @@
        "type": "color"
      },
      "focused": {
-        "value": "#93a1a1",
+        "value": "#93a1a11f",
        "type": "color"
      }
    },
@@ -119,7 +119,7 @@
        "type": "color"
      },
      "focused": {
-        "value": "#93a1a1",
+        "value": "#93a1a11f",
        "type": "color"
      }
    },
@@ -129,15 +129,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#eee8d5",
+        "value": "#eee8d51f",
        "type": "color"
      },
      "active": {
-        "value": "#eee8d5",
+        "value": "#eee8d52e",
        "type": "color"
      },
      "focused": {
-        "value": "#eee8d5",
+        "value": "#eee8d51f",
        "type": "color"
      }
    },
@@ -147,15 +147,15 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#eee8d5",
+        "value": "#eee8d51f",
        "type": "color"
      },
      "active": {
-        "value": "#eee8d5",
+        "value": "#eee8d53d",
        "type": "color"
      },
      "focused": {
-        "value": "#eee8d5",
+        "value": "#eee8d51f",
        "type": "color"
      }
    },
@@ -165,87 +165,87 @@
        "type": "color"
      },
      "hovered": {
-        "value": "#839496",
+        "value": "#93a1a11f",
        "type": "color"
      },
      "active": {
-        "value": "#839496",
+        "value": "#93a1a13d",
        "type": "color"
      },
      "focused": {
-        "value": "#839496",
+        "value": "#93a1a11f",
        "type": "color"
      }
    },
    "ok": {
      "base": {
-        "value": "#859900",
+        "value": "#85990026",
        "type": "color"
      },
      "hovered": {
-        "value": "#859900",
+        "value": "#85990033",
        "type": "color"
      },
      "active": {
-        "value": "#859900",
+        "value": "#85990040",
        "type": "color"
      },
      "focused": {
-        "value": "#859900",
+        "value": "#85990033",
        "type": "color"
      }
    },
    "error": {
      "base": {
-        "value": "#dc322f",
+        "value": "#dc322f26",
        "type": "color"
      },
      "hovered": {
-        "value": "#dc322f",
+        "value": "#dc322f33",
        "type": "color"
      },
      "active": {
-        "value": "#dc322f",
+        "value": "#dc322f40",
        "type": "color"
      },
      "focused": {
-        "value": "#dc322f",
+        "value": "#dc322f33",
        "type": "color"
      }
    },
    "warning": {
      "base": {
-        "value": "#b58900",
+        "value": "#b5890026",
        "type": "color"
      },
      "hovered": {
-        "value": "#b58900",
+        "value": "#b5890033",
        "type": "color"
      },
      "active": {
-        "value": "#b58900",
+        "value": "#b5890040",
        "type": "color"
      },
      "focused": {
-        "value": "#b58900",
+        "value": "#b5890033",
        "type": "color"
      }
    },
    "info": {
      "base": {
-        "value": "#268bd2",
+        "value": "#268bd226",
        "type": "color"
      },
      "hovered": {
-        "value": "#268bd2",
+        "value": "#268bd233",
        "type": "color"
      },
      "active": {
-        "value": "#268bd2",
+        "value": "#268bd240",
        "type": "color"
      },
      "focused": {
-        "value": "#268bd2",
+        "value": "#268bd233",
        "type": "color"
      }
    }
@@ -272,19 +272,19 @@
      "type": "color"
    },
    "ok": {
-      "value": "#859900",
+      "value": "#85990026",
      "type": "color"
    },
    "error": {
-      "value": "#dc322f",
+      "value": "#dc322f26",
      "type": "color"
    },
    "warning": {
-      "value": "#b58900",
+      "value": "#b5890026",
      "type": "color"
    },
    "info": {
-      "value": "#268bd2",
+      "value": "#268bd226",
      "type": "color"
    }
  },
@@ -311,15 +311,15 @@
        "type": "color"
      },
      "inserted": {
-        "value": "#859900",
+        "value": "#85990040",
        "type": "color"
      },
      "deleted": {
-        "value": "#dc322f",
+        "value": "#dc322f40",
        "type": "color"
      },
      "modified": {
-        "value": "#268bd2",
+        "value": "#268bd240",
        "type": "color"
      }
    },
@@ -329,27 +329,27 @@
        "type": "color"
      },
      "occurrence": {
-        "value": "#fdf6e31f",
+        "value": "#002b360f",
        "type": "color"
      },
      "activeOccurrence": {
-        "value": "#fdf6e329",
+        "value": "#002b361f",
        "type": "color"
      },
      "matchingBracket": {
-        "value": "#eee8d5",
+        "value": "#eee8d52e",
        "type": "color"
      },
      "match": {
-        "value": "#6c71c480",
+        "value": "#6c71c43d",
        "type": "color"
      },
      "activeMatch": {
-        "value": "#6c71c4b3",
+        "value": "#6c71c45c",
        "type": "color"
      },
      "related": {
-        "value": "#eee8d5",
+        "value": "#eee8d51f",
        "type": "color"
      }
    },
--- a/styles/dist/tokens.json
+++ b/styles/dist/tokens.json
@@ -1401,88 +1401,88 @@
      },
      "ok": {
        "base": {
-          "value": "#1b9447",
+          "value": "#1b944726",
          "description": "Step: 600",
          "type": "color"
        },
        "hovered": {
-          "value": "#1b9447",
+          "value": "#1b944733",
          "description": "Step: 600",
          "type": "color"
        },
        "active": {
-          "value": "#1b9447",
+          "value": "#1b944740",
          "description": "Step: 600",
          "type": "color"
        },
        "focused": {
-          "value": "#1b9447",
+          "value": "#1b944733",
          "description": "Step: 600",
          "type": "color"
        }
      },
      "error": {
        "base": {
-          "value": "#f15656",
-          "description": "Step: 400",
+          "value": "#c9181826",
+          "description": "Step: 600",
          "type": "color"
        },
        "hovered": {
-          "value": "#f15656",
-          "description": "Step: 400",
+          "value": "#c9181833",
+          "description": "Step: 600",
          "type": "color"
        },
        "active": {
-          "value": "#f15656",
-          "description": "Step: 400",
+          "value": "#c9181840",
+          "description": "Step: 600",
          "type": "color"
        },
        "focused": {
-          "value": "#f15656",
-          "description": "Step: 400",
+          "value": "#c9181833",
+          "description": "Step: 600",
          "type": "color"
        }
      },
      "warning": {
        "base": {
-          "value": "#f7bb57",
-          "description": "Step: 300",
+          "value": "#f6a72426",
+          "description": "Step: 400",
          "type": "color"
        },
        "hovered": {
-          "value": "#f7bb57",
-          "description": "Step: 300",
+          "value": "#f6a72433",
+          "description": "Step: 400",
          "type": "color"
        },
        "active": {
-          "value": "#f7bb57",
-          "description": "Step: 300",
+          "value": "#f6a72440",
+          "description": "Step: 400",
          "type": "color"
        },
        "focused": {
-          "value": "#f7bb57",
-          "description": "Step: 300",
+          "value": "#f6a72433",
+          "description": "Step: 400",
          "type": "color"
        }
      },
      "info": {
        "base": {
-          "value": "#2472f2",
+          "value": "#2472f226",
          "description": "Step: 500",
          "type": "color"
        },
        "hovered": {
-          "value": "#2472f2",
+          "value": "#2472f233",
          "description": "Step: 500",
          "type": "color"
        },
        "active": {
-          "value": "#2472f2",
+          "value": "#2472f240",
          "description": "Step: 500",
          "type": "color"
        },
        "focused": {
-          "value": "#2472f2",
+          "value": "#2472f233",
          "description": "Step: 500",
          "type": "color"
        }
@@ -1515,22 +1515,22 @@
        "type": "color"
      },
      "ok": {
-        "value": "#20b456",
-        "description": "Step: 500",
+        "value": "#1b944726",
+        "description": "Step: 600",
        "type": "color"
      },
      "error": {
-        "value": "#eb2d2d",
+        "value": "#eb2d2d26",
        "description": "Step: 500",
        "type": "color"
      },
      "warning": {
-        "value": "#de900c",
-        "description": "Step: 500",
+        "value": "#f6a72426",
+        "description": "Step: 400",
        "type": "color"
      },
      "info": {
-        "value": "#2472f2",
+        "value": "#2472f226",
        "description": "Step: 500",
        "type": "color"
      }
@@ -1563,17 +1563,17 @@
          "type": "color"
        },
        "inserted": {
-          "value": "#1b9447",
+          "value": "#1b944740",
          "description": "Step: 600",
          "type": "color"
        },
        "deleted": {
-          "value": "#f15656",
-          "description": "Step: 400",
+          "value": "#c9181840",
+          "description": "Step: 600",
          "type": "color"
        },
        "modified": {
-          "value": "#2472f2",
+          "value": "#2472f240",
          "description": "Step: 500",
          "type": "color"
        }
@@ -2094,89 +2094,89 @@
      },
      "ok": {
        "base": {
-          "value": "#b7f9ce",
-          "description": "Step: 100",
+          "value": "#1b944726",
+          "description": "Step: 600",
          "type": "color"
        },
        "hovered": {
-          "value": "#b7f9ce",
-          "description": "Step: 100",
+          "value": "#1b944733",
+          "description": "Step: 600",
          "type": "color"
        },
        "active": {
-          "value": "#b7f9ce",
-          "description": "Step: 100",
+          "value": "#1b944740",
+          "description": "Step: 600",
          "type": "color"
        },
        "focused": {
-          "value": "#b7f9ce",
-          "description": "Step: 100",
+          "value": "#1b944733",
+          "description": "Step: 600",
          "type": "color"
        }
      },
      "error": {
        "base": {
-          "value": "#fcc6c6",
-          "description": "Step: 100",
+          "value": "#c9181826",
+          "description": "Step: 600",
          "type": "color"
        },
        "hovered": {
-          "value": "#fcc6c6",
-          "description": "Step: 100",
+          "value": "#c9181833",
+          "description": "Step: 600",
          "type": "color"
        },
        "active": {
-          "value": "#fcc6c6",
-          "description": "Step: 100",
+          "value": "#c9181840",
+          "description": "Step: 600",
          "type": "color"
        },
        "focused": {
-          "value": "#fcc6c6",
-          "description": "Step: 100",
+          "value": "#c9181833",
+          "description": "Step: 600",
          "type": "color"
        }
      },
      "warning": {
        "base": {
-          "value": "#fce9b7",
-          "description": "Step: 100",
+          "value": "#f6a72426",
+          "description": "Step: 400",
          "type": "color"
        },
        "hovered": {
-          "value": "#fce9b7",
-          "description": "Step: 100",
+          "value": "#f6a72433",
+          "description": "Step: 400",
          "type": "color"
        },
        "active": {
-          "value": "#fce9b7",
-          "description": "Step: 100",
+          "value": "#f6a72440",
+          "description": "Step: 400",
          "type": "color"
        },
        "focused": {
-          "value": "#fce9b7",
-          "description": "Step: 100",
+          "value": "#f6a72433",
+          "description": "Step: 400",
          "type": "color"
        }
      },
      "info": {
        "base": {
-          "value": "#c5dafc",
-          "description": "Step: 100",
+          "value": "#2472f226",
+          "description": "Step: 500",
          "type": "color"
        },
        "hovered": {
-          "value": "#c5dafc",
-          "description": "Step: 100",
+          "value": "#2472f233",
+          "description": "Step: 500",
          "type": "color"
        },
        "active": {
-          "value": "#c5dafc",
-          "description": "Step: 100",
+          "value": "#2472f240",
+          "description": "Step: 500",
          "type": "color"
        },
        "focused": {
-          "value": "#c5dafc",
-          "description": "Step: 100",
+          "value": "#2472f233",
+          "description": "Step: 500",
          "type": "color"
        }
      }
@@ -2208,23 +2208,23 @@
        "type": "color"
      },
      "ok": {
-        "value": "#84f2ab",
-        "description": "Step: 200",
+        "value": "#1b944726",
+        "description": "Step: 600",
        "type": "color"
      },
      "error": {
-        "value": "#f9a0a0",
-        "description": "Step: 200",
+        "value": "#eb2d2d26",
+        "description": "Step: 500",
        "type": "color"
      },
      "warning": {
-        "value": "#f9da82",
-        "description": "Step: 200",
+        "value": "#f6a72426",
+        "description": "Step: 400",
        "type": "color"
      },
      "info": {
-        "value": "#9ec1fa",
-        "description": "Step: 200",
+        "value": "#2472f226",
+        "description": "Step: 500",
        "type": "color"
      }
    },
@@ -2256,18 +2256,18 @@
          "type": "color"
        },
        "inserted": {
-          "value": "#b7f9ce",
-          "description": "Step: 100",
+          "value": "#1b944740",
+          "description": "Step: 600",
          "type": "color"
        },
        "deleted": {
-          "value": "#fcc6c6",
-          "description": "Step: 100",
+          "value": "#c9181840",
+          "description": "Step: 600",
          "type": "color"
        },
        "modified": {
-          "value": "#c5dafc",
-          "description": "Step: 100",
+          "value": "#2472f240",
+          "description": "Step: 500",
          "type": "color"
        }
      },
@@ -2661,15 +2661,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#586e7552",
+          "value": "#586e753d",
          "type": "color"
        },
        "active": {
-          "value": "#586e757a",
+          "value": "#586e755c",
          "type": "color"
        },
        "focused": {
-          "value": "#586e75",
+          "value": "#586e753d",
          "type": "color"
        }
      },
@@ -2679,15 +2679,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#586e7552",
+          "value": "#586e753d",
          "type": "color"
        },
        "active": {
-          "value": "#586e757a",
+          "value": "#586e755c",
          "type": "color"
        },
        "focused": {
-          "value": "#586e75",
+          "value": "#586e753d",
          "type": "color"
        }
      },
@@ -2697,15 +2697,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#073642",
+          "value": "#0736423d",
          "type": "color"
        },
        "active": {
-          "value": "#073642",
+          "value": "#0736425c",
          "type": "color"
        },
        "focused": {
-          "value": "#073642",
+          "value": "#0736423d",
          "type": "color"
        }
      },
@@ -2715,15 +2715,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#073642",
+          "value": "#0736423d",
          "type": "color"
        },
        "active": {
-          "value": "#073642",
+          "value": "#0736427a",
          "type": "color"
        },
        "focused": {
-          "value": "#073642",
+          "value": "#0736423d",
          "type": "color"
        }
      },
@@ -2733,87 +2733,87 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#657b83",
+          "value": "#586e753d",
          "type": "color"
        },
        "active": {
-          "value": "#657b83",
+          "value": "#586e757a",
          "type": "color"
        },
        "focused": {
-          "value": "#657b83",
+          "value": "#586e753d",
          "type": "color"
        }
      },
      "ok": {
        "base": {
-          "value": "#859900",
+          "value": "#85990026",
          "type": "color"
        },
        "hovered": {
-          "value": "#859900",
+          "value": "#85990033",
          "type": "color"
        },
        "active": {
-          "value": "#859900",
+          "value": "#85990040",
          "type": "color"
        },
        "focused": {
-          "value": "#859900",
+          "value": "#85990033",
          "type": "color"
        }
      },
      "error": {
        "base": {
-          "value": "#dc322f",
+          "value": "#dc322f26",
          "type": "color"
        },
        "hovered": {
-          "value": "#dc322f",
+          "value": "#dc322f33",
          "type": "color"
        },
        "active": {
-          "value": "#dc322f",
+          "value": "#dc322f40",
          "type": "color"
        },
        "focused": {
-          "value": "#dc322f",
+          "value": "#dc322f33",
          "type": "color"
        }
      },
      "warning": {
        "base": {
-          "value": "#b58900",
+          "value": "#b5890026",
          "type": "color"
        },
        "hovered": {
-          "value": "#b58900",
+          "value": "#b5890033",
          "type": "color"
        },
        "active": {
-          "value": "#b58900",
+          "value": "#b5890040",
          "type": "color"
        },
        "focused": {
-          "value": "#b58900",
+          "value": "#b5890033",
          "type": "color"
        }
      },
      "info": {
        "base": {
-          "value": "#268bd2",
+          "value": "#268bd226",
          "type": "color"
        },
        "hovered": {
-          "value": "#268bd2",
+          "value": "#268bd233",
          "type": "color"
        },
        "active": {
-          "value": "#268bd2",
+          "value": "#268bd240",
          "type": "color"
        },
        "focused": {
-          "value": "#268bd2",
+          "value": "#268bd233",
          "type": "color"
        }
      }
@@ -2840,19 +2840,19 @@
        "type": "color"
      },
      "ok": {
-        "value": "#859900",
+        "value": "#85990026",
        "type": "color"
      },
      "error": {
-        "value": "#dc322f",
+        "value": "#dc322f26",
        "type": "color"
      },
      "warning": {
-        "value": "#b58900",
+        "value": "#b5890026",
        "type": "color"
      },
      "info": {
-        "value": "#268bd2",
+        "value": "#268bd226",
        "type": "color"
      }
    },
@@ -2879,15 +2879,15 @@
          "type": "color"
        },
        "inserted": {
-          "value": "#859900",
+          "value": "#85990040",
          "type": "color"
        },
        "deleted": {
-          "value": "#dc322f",
+          "value": "#dc322f40",
          "type": "color"
        },
        "modified": {
-          "value": "#268bd2",
+          "value": "#268bd240",
          "type": "color"
        }
      },
@@ -2897,27 +2897,27 @@
          "type": "color"
        },
        "occurrence": {
-          "value": "#002b361f",
+          "value": "#fdf6e31f",
          "type": "color"
        },
        "activeOccurrence": {
-          "value": "#002b3629",
+          "value": "#fdf6e33d",
          "type": "color"
        },
        "matchingBracket": {
-          "value": "#073642",
+          "value": "#0736425c",
          "type": "color"
        },
        "match": {
-          "value": "#6c71c480",
+          "value": "#6c71c47a",
          "type": "color"
        },
        "activeMatch": {
-          "value": "#6c71c4b3",
+          "value": "#6c71c4b8",
          "type": "color"
        },
        "related": {
-          "value": "#073642",
+          "value": "#0736423d",
          "type": "color"
        }
      },
@@ -3129,7 +3129,7 @@
      }
    },
    "shadowAlpha": {
-      "value": 0.32,
+      "value": 0.24,
      "type": "number"
    }
  },
@@ -3236,7 +3236,7 @@
          "type": "color"
        },
        "focused": {
-          "value": "#93a1a1",
+          "value": "#93a1a11f",
          "type": "color"
        }
      },
@@ -3254,7 +3254,7 @@
          "type": "color"
        },
        "focused": {
-          "value": "#93a1a1",
+          "value": "#93a1a11f",
          "type": "color"
        }
      },
@@ -3264,15 +3264,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#eee8d5",
+          "value": "#eee8d51f",
          "type": "color"
        },
        "active": {
-          "value": "#eee8d5",
+          "value": "#eee8d52e",
          "type": "color"
        },
        "focused": {
-          "value": "#eee8d5",
+          "value": "#eee8d51f",
          "type": "color"
        }
      },
@@ -3282,15 +3282,15 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#eee8d5",
+          "value": "#eee8d51f",
          "type": "color"
        },
        "active": {
-          "value": "#eee8d5",
+          "value": "#eee8d53d",
          "type": "color"
        },
        "focused": {
-          "value": "#eee8d5",
+          "value": "#eee8d51f",
          "type": "color"
        }
      },
@@ -3300,87 +3300,87 @@
          "type": "color"
        },
        "hovered": {
-          "value": "#839496",
+          "value": "#93a1a11f",
          "type": "color"
        },
        "active": {
-          "value": "#839496",
+          "value": "#93a1a13d",
          "type": "color"
        },
        "focused": {
-          "value": "#839496",
+          "value": "#93a1a11f",
          "type": "color"
        }
      },
      "ok": {
        "base": {
-          "value": "#859900",
+          "value": "#85990026",
          "type": "color"
        },
        "hovered": {
-          "value": "#859900",
+          "value": "#85990033",
          "type": "color"
        },
        "active": {
-          "value": "#859900",
+          "value": "#85990040",
          "type": "color"
        },
        "focused": {
-          "value": "#859900",
+          "value": "#85990033",
          "type": "color"
        }
      },
      "error": {
        "base": {
-          "value": "#dc322f",
+          "value": "#dc322f26",
          "type": "color"
        },
        "hovered": {
-          "value": "#dc322f",
+          "value": "#dc322f33",
          "type": "color"
        },
        "active": {
-          "value": "#dc322f",
+          "value": "#dc322f40",
          "type": "color"
        },
        "focused": {
-          "value": "#dc322f",
+          "value": "#dc322f33",
          "type": "color"
        }
      },
      "warning": {
        "base": {
-          "value": "#b58900",
+          "value": "#b5890026",
          "type": "color"
        },
        "hovered": {
-          "value": "#b58900",
+          "value": "#b5890033",
          "type": "color"
        },
        "active": {
-          "value": "#b58900",
+          "value": "#b5890040",
          "type": "color"
        },
        "focused": {
-          "value": "#b58900",
+          "value": "#b5890033",
          "type": "color"
        }
      },
      "info": {
        "base": {
-          "value": "#268bd2",
+          "value": "#268bd226",
          "type": "color"
        },
        "hovered": {
-          "value": "#268bd2",
+          "value": "#268bd233",
          "type": "color"
        },
        "active": {
-          "value": "#268bd2",
+          "value": "#268bd240",
          "type": "color"
        },
        "focused": {
-          "value": "#268bd2",
+          "value": "#268bd233",
          "type": "color"
        }
      }
@@ -3407,19 +3407,19 @@
        "type": "color"
      },
      "ok": {
-        "value": "#859900",
+        "value": "#85990026",
        "type": "color"
      },
      "error": {
-        "value": "#dc322f",
+        "value": "#dc322f26",
        "type": "color"
      },
      "warning": {
-        "value": "#b58900",
+        "value": "#b5890026",
        "type": "color"
      },
      "info": {
-        "value": "#268bd2",
+        "value": "#268bd226",
        "type": "color"
      }
    },
@@ -3446,15 +3446,15 @@
          "type": "color"
        },
        "inserted": {
-          "value": "#859900",
+          "value": "#85990040",
          "type": "color"
        },
        "deleted": {
-          "value": "#dc322f",
+          "value": "#dc322f40",
          "type": "color"
        },
        "modified": {
-          "value": "#268bd2",
+          "value": "#268bd240",
          "type": "color"
        }
      },
@@ -3464,27 +3464,27 @@
          "type": "color"
        },
        "occurrence": {
-          "value": "#fdf6e31f",
+          "value": "#002b360f",
          "type": "color"
        },
        "activeOccurrence": {
-          "value": "#fdf6e329",
+          "value": "#002b361f",
          "type": "color"
        },
        "matchingBracket": {
-          "value": "#eee8d5",
+          "value": "#eee8d52e",
          "type": "color"
        },
        "match": {
-          "value": "#6c71c480",
+          "value": "#6c71c43d",
          "type": "color"
        },
        "activeMatch": {
-          "value": "#6c71c4b3",
+          "value": "#6c71c45c",
          "type": "color"
        },
        "related": {
-          "value": "#eee8d5",
+          "value": "#eee8d51f",
          "type": "color"
        }
      },
--- a/styles/src/styleTree/workspace.ts
+++ b/styles/src/styleTree/workspace.ts
@@ -61,10 +61,12 @@ export default function workspace(theme: Theme) {
    statusBar: statusBar(theme),
    titlebar: {
      avatarWidth: 18,
+      avatarMargin: 8,
      height: 33,
      background: backgroundColor(theme, 100),
      padding: {
        left: 80,
+        right: 6,
      },
      title: text(theme, "sans", "primary"),
      avatar: {
@@ -86,7 +88,6 @@ export default function workspace(theme: Theme) {
        cornerRadius: 6,
        margin: {
          top: 1,
-          right: 6,
        },
        padding: {
          left: 6,
@@ -104,7 +105,7 @@ export default function workspace(theme: Theme) {
      },
      shareIcon: {
        cornerRadius: 6,
-        margin: { top: 3, bottom: 2 },
+        margin: { top: 3, bottom: 2, left: 6 },
        color: iconColor(theme, "secondary"),
        hover: {
          background: backgroundColor(theme, 100, "hovered"),
@@ -128,7 +129,6 @@ export default function workspace(theme: Theme) {
          right: 6,
        },
        cornerRadius: 6,
-        margin: { right: 6 }
      },
    },
    toolbar: {
--- a/styles/src/themes/base16.ts
+++ b/styles/src/themes/base16.ts
@@ -17,7 +17,7 @@ export function createTheme(name: string, isLight: boolean, neutral: ColorToken[
  if (isLight) {
    neutral = [...neutral].reverse();
  }
-  let blend = isLight ? 0.12 : 0.32;
+  let blend = isLight ? 0.12 : 0.24;

  const backgroundColor = {
    100: {
@@ -125,11 +125,11 @@ export function createTheme(name: string, isLight: boolean, neutral: ColorToken[
    },
    highlight: {
      selection: player[1].selectionColor,
-      occurrence: withOpacity(neutral[0], 0.12),
-      activeOccurrence: withOpacity(neutral[0], 0.16),
+      occurrence: withOpacity(neutral[7], blend / 2),
+      activeOccurrence: withOpacity(neutral[7], blend),
      matchingBracket: backgroundColor[500].active,
-      match: withOpacity(accent.violet, 0.5),
-      activeMatch: withOpacity(accent.violet, 0.7),
+      match: withOpacity(accent.violet, blend * 2),
+      activeMatch: withOpacity(accent.violet, blend * 3),
      related: backgroundColor[500].focused,
    },
    gutter: {
Author	SHA1	Message	Date
Antonio Scandurra	1931c00ed9	v0.31.1	2022-05-03 18:21:02 +02:00
Antonio Scandurra	7606ce38aa	Merge pull request #965 from zed-industries/avatar-margin Parameterize `avatar_margin` and assign it a default of 8	2022-05-03 18:20:50 +02:00
Antonio Scandurra	a763a99347	Merge pull request #958 from zed-industries/titlebar-padding Add right padding to titlebar instead of margins on elements	2022-05-03 18:20:40 +02:00
Nate Butler	6f25ed0261	Merge pull request #949 from zed-industries/base16-theme-occurrence-style Update base16 theme occurrence style	2022-05-03 18:20:31 +02:00