From db0eaca2e5a1bbea2bf0192429ab7f3320e38a60 Mon Sep 17 00:00:00 2001 From: Philipp Schaffrath Date: Tue, 20 Feb 2024 17:26:09 +0100 Subject: [PATCH] Rename scrollbar_thumb to be consistent with other style properties (#8004) This small inconsistency was mentioned on the discord. This fixes it. Release Notes: - Themes: Renamed `scrollbar_thumb.background` to `scrollbar.thumb.background` to be consistent with other style properties. --------- Co-authored-by: Marshall Bowers --- assets/themes/andromeda/andromeda.json | 2 +- assets/themes/atelier/atelier.json | 40 ++++++++++++------------ assets/themes/ayu/ayu.json | 6 ++-- assets/themes/gruvbox/gruvbox.json | 12 +++---- assets/themes/one/one.json | 4 +-- assets/themes/rose_pine/rose_pine.json | 6 ++-- assets/themes/sandcastle/sandcastle.json | 2 +- assets/themes/solarized/solarized.json | 4 +-- assets/themes/summercamp/summercamp.json | 2 +- crates/theme/src/schema.rs | 5 ++- 10 files changed, 43 insertions(+), 40 deletions(-) diff --git a/assets/themes/andromeda/andromeda.json b/assets/themes/andromeda/andromeda.json index a9144907cdf30aa6232d070ea25769e0038be355..9eabd85cee88c2f95e6510573133d263c3ea04c9 100644 --- a/assets/themes/andromeda/andromeda.json +++ b/assets/themes/andromeda/andromeda.json @@ -46,7 +46,7 @@ "panel.background": "#21242bff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f7f7f84c", + "scrollbar.thumb.background": "#f7f7f84c", "scrollbar.thumb.hover_background": "#252931ff", "scrollbar.thumb.border": "#252931ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/atelier/atelier.json b/assets/themes/atelier/atelier.json index 7f8bdfbaf3d64b0d30d285412c8c84f5d8a50d99..55195bbf80b3d022b61298494a655413bee681cb 100644 --- a/assets/themes/atelier/atelier.json +++ b/assets/themes/atelier/atelier.json @@ -46,7 +46,7 @@ "panel.background": "#221f26ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#efecf44c", + "scrollbar.thumb.background": "#efecf44c", "scrollbar.thumb.hover_background": "#332f38ff", "scrollbar.thumb.border": "#332f38ff", "scrollbar.track.background": "#00000000", @@ -430,7 +430,7 @@ "panel.background": "#e6e3ebff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#19171c4c", + "scrollbar.thumb.background": "#19171c4c", "scrollbar.thumb.hover_background": "#cbc8d1ff", "scrollbar.thumb.border": "#cbc8d1ff", "scrollbar.track.background": "#00000000", @@ -814,7 +814,7 @@ "panel.background": "#262622ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fefbec4c", + "scrollbar.thumb.background": "#fefbec4c", "scrollbar.thumb.hover_background": "#3b3933ff", "scrollbar.thumb.border": "#3b3933ff", "scrollbar.track.background": "#00000000", @@ -1198,7 +1198,7 @@ "panel.background": "#eeebd7ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#20201d4c", + "scrollbar.thumb.background": "#20201d4c", "scrollbar.thumb.hover_background": "#d7d3beff", "scrollbar.thumb.border": "#d7d3beff", "scrollbar.track.background": "#00000000", @@ -1582,7 +1582,7 @@ "panel.background": "#2c2b23ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f4f3ec4c", + "scrollbar.thumb.background": "#f4f3ec4c", "scrollbar.thumb.hover_background": "#3c3b31ff", "scrollbar.thumb.border": "#3c3b31ff", "scrollbar.track.background": "#00000000", @@ -1966,7 +1966,7 @@ "panel.background": "#ebeae3ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#22221b4c", + "scrollbar.thumb.background": "#22221b4c", "scrollbar.thumb.hover_background": "#d0cfc5ff", "scrollbar.thumb.border": "#d0cfc5ff", "scrollbar.track.background": "#00000000", @@ -2350,7 +2350,7 @@ "panel.background": "#27211eff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f0eeed4c", + "scrollbar.thumb.background": "#f0eeed4c", "scrollbar.thumb.hover_background": "#3b3431ff", "scrollbar.thumb.border": "#3b3431ff", "scrollbar.track.background": "#00000000", @@ -2734,7 +2734,7 @@ "panel.background": "#e9e6e4ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#1b19184c", + "scrollbar.thumb.background": "#1b19184c", "scrollbar.thumb.hover_background": "#d6d1cfff", "scrollbar.thumb.border": "#d6d1cfff", "scrollbar.track.background": "#00000000", @@ -3118,7 +3118,7 @@ "panel.background": "#252025ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f7f3f74c", + "scrollbar.thumb.background": "#f7f3f74c", "scrollbar.thumb.hover_background": "#393239ff", "scrollbar.thumb.border": "#393239ff", "scrollbar.track.background": "#00000000", @@ -3502,7 +3502,7 @@ "panel.background": "#e0d5e0ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#1b181b4c", + "scrollbar.thumb.background": "#1b181b4c", "scrollbar.thumb.hover_background": "#ccbdccff", "scrollbar.thumb.border": "#ccbdccff", "scrollbar.track.background": "#00000000", @@ -3886,7 +3886,7 @@ "panel.background": "#1c2529ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#ebf8ff4c", + "scrollbar.thumb.background": "#ebf8ff4c", "scrollbar.thumb.hover_background": "#2c3b42ff", "scrollbar.thumb.border": "#2c3b42ff", "scrollbar.track.background": "#00000000", @@ -4270,7 +4270,7 @@ "panel.background": "#cdeaf9ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#161b1d4c", + "scrollbar.thumb.background": "#161b1d4c", "scrollbar.thumb.hover_background": "#b0d3e5ff", "scrollbar.thumb.border": "#b0d3e5ff", "scrollbar.track.background": "#00000000", @@ -4654,7 +4654,7 @@ "panel.background": "#252020ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f4ecec4c", + "scrollbar.thumb.background": "#f4ecec4c", "scrollbar.thumb.hover_background": "#352f2fff", "scrollbar.thumb.border": "#352f2fff", "scrollbar.track.background": "#00000000", @@ -5038,7 +5038,7 @@ "panel.background": "#ebe3e3ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#1b18184c", + "scrollbar.thumb.background": "#1b18184c", "scrollbar.thumb.hover_background": "#cfc7c7ff", "scrollbar.thumb.border": "#cfc7c7ff", "scrollbar.track.background": "#00000000", @@ -5422,7 +5422,7 @@ "panel.background": "#1f2621ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#ecf4ee4c", + "scrollbar.thumb.background": "#ecf4ee4c", "scrollbar.thumb.hover_background": "#2f3832ff", "scrollbar.thumb.border": "#2f3832ff", "scrollbar.track.background": "#00000000", @@ -5806,7 +5806,7 @@ "panel.background": "#e3ebe6ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#171c194c", + "scrollbar.thumb.background": "#171c194c", "scrollbar.thumb.hover_background": "#c8d1cbff", "scrollbar.thumb.border": "#c8d1cbff", "scrollbar.track.background": "#00000000", @@ -6190,7 +6190,7 @@ "panel.background": "#1f231fff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f3faf34c", + "scrollbar.thumb.background": "#f3faf34c", "scrollbar.thumb.hover_background": "#333b33ff", "scrollbar.thumb.border": "#333b33ff", "scrollbar.track.background": "#00000000", @@ -6574,7 +6574,7 @@ "panel.background": "#daeedaff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#1315134c", + "scrollbar.thumb.background": "#1315134c", "scrollbar.thumb.hover_background": "#bed7beff", "scrollbar.thumb.border": "#bed7beff", "scrollbar.track.background": "#00000000", @@ -6958,7 +6958,7 @@ "panel.background": "#262f51ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f5f7ff4c", + "scrollbar.thumb.background": "#f5f7ff4c", "scrollbar.thumb.hover_background": "#363f62ff", "scrollbar.thumb.border": "#363f62ff", "scrollbar.track.background": "#00000000", @@ -7342,7 +7342,7 @@ "panel.background": "#e5e8f5ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#2026464c", + "scrollbar.thumb.background": "#2026464c", "scrollbar.thumb.hover_background": "#ccd0e1ff", "scrollbar.thumb.border": "#ccd0e1ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json index 40b426220427725a4a579c1bd4e78a15b17f2971..87640ffeb9ab30d8cfeca223870031def75c4ef9 100644 --- a/assets/themes/ayu/ayu.json +++ b/assets/themes/ayu/ayu.json @@ -46,7 +46,7 @@ "panel.background": "#1f2127ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#bfbdb64c", + "scrollbar.thumb.background": "#bfbdb64c", "scrollbar.thumb.hover_background": "#2d2f34ff", "scrollbar.thumb.border": "#2d2f34ff", "scrollbar.track.background": "#00000000", @@ -415,7 +415,7 @@ "panel.background": "#ececedff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#5c61664c", + "scrollbar.thumb.background": "#5c61664c", "scrollbar.thumb.hover_background": "#dfe0e1ff", "scrollbar.thumb.border": "#dfe0e1ff", "scrollbar.track.background": "#00000000", @@ -784,7 +784,7 @@ "panel.background": "#353944ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#cccac24c", + "scrollbar.thumb.background": "#cccac24c", "scrollbar.thumb.hover_background": "#43464fff", "scrollbar.thumb.border": "#43464fff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json index eddcae6ff89bb4e19c974c1ce151de69c312a591..3e6a410b09e88ff81b58d1481846c4497707d7d7 100644 --- a/assets/themes/gruvbox/gruvbox.json +++ b/assets/themes/gruvbox/gruvbox.json @@ -46,7 +46,7 @@ "panel.background": "#3a3735ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fbf1c74c", + "scrollbar.thumb.background": "#fbf1c74c", "scrollbar.thumb.hover_background": "#494340ff", "scrollbar.thumb.border": "#494340ff", "scrollbar.track.background": "#00000000", @@ -420,7 +420,7 @@ "panel.background": "#393634ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fbf1c74c", + "scrollbar.thumb.background": "#fbf1c74c", "scrollbar.thumb.hover_background": "#494340ff", "scrollbar.thumb.border": "#494340ff", "scrollbar.track.background": "#00000000", @@ -794,7 +794,7 @@ "panel.background": "#3b3735ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fbf1c74c", + "scrollbar.thumb.background": "#fbf1c74c", "scrollbar.thumb.hover_background": "#494340ff", "scrollbar.thumb.border": "#494340ff", "scrollbar.track.background": "#00000000", @@ -1168,7 +1168,7 @@ "panel.background": "#ecddb4ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#2828284c", + "scrollbar.thumb.background": "#2828284c", "scrollbar.thumb.hover_background": "#ddcca7ff", "scrollbar.thumb.border": "#ddcca7ff", "scrollbar.track.background": "#00000000", @@ -1542,7 +1542,7 @@ "panel.background": "#ecddb5ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#2828284c", + "scrollbar.thumb.background": "#2828284c", "scrollbar.thumb.hover_background": "#ddcca7ff", "scrollbar.thumb.border": "#ddcca7ff", "scrollbar.track.background": "#00000000", @@ -1916,7 +1916,7 @@ "panel.background": "#ecdcb3ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#2828284c", + "scrollbar.thumb.background": "#2828284c", "scrollbar.thumb.hover_background": "#ddcca7ff", "scrollbar.thumb.border": "#ddcca7ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json index b8953f95f4797beb8118750d85f7b835587da29a..cdf9bb05fea904ca5c37593cdd020aa08af29ef3 100644 --- a/assets/themes/one/one.json +++ b/assets/themes/one/one.json @@ -46,7 +46,7 @@ "panel.background": "#2f343eff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#c8ccd44c", + "scrollbar.thumb.background": "#c8ccd44c", "scrollbar.thumb.hover_background": "#363c46ff", "scrollbar.thumb.border": "#363c46ff", "scrollbar.track.background": "#00000000", @@ -420,7 +420,7 @@ "panel.background": "#ebebecff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#383a414c", + "scrollbar.thumb.background": "#383a414c", "scrollbar.thumb.hover_background": "#dfdfe0ff", "scrollbar.thumb.border": "#dfdfe0ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/rose_pine/rose_pine.json b/assets/themes/rose_pine/rose_pine.json index 69b89f8005aed1635bfaea6dc63f35d8e6d32505..e74d1c7dcfc5c359b915910a185d8d33ce0f52ea 100644 --- a/assets/themes/rose_pine/rose_pine.json +++ b/assets/themes/rose_pine/rose_pine.json @@ -46,7 +46,7 @@ "panel.background": "#1c1b2aff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#e0def44c", + "scrollbar.thumb.background": "#e0def44c", "scrollbar.thumb.hover_background": "#232132ff", "scrollbar.thumb.border": "#232132ff", "scrollbar.track.background": "#00000000", @@ -425,7 +425,7 @@ "panel.background": "#fef9f2ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#5752794c", + "scrollbar.thumb.background": "#5752794c", "scrollbar.thumb.hover_background": "#e5e0dfff", "scrollbar.thumb.border": "#e5e0dfff", "scrollbar.track.background": "#00000000", @@ -804,7 +804,7 @@ "panel.background": "#28253cff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#e0def44c", + "scrollbar.thumb.background": "#e0def44c", "scrollbar.thumb.hover_background": "#322f48ff", "scrollbar.thumb.border": "#322f48ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/sandcastle/sandcastle.json b/assets/themes/sandcastle/sandcastle.json index 6c42fee3c6fa6c7e865a304ba499ee8fff5e7d6d..f56b1b8b4b93406ead01f7fceb3548825380ad21 100644 --- a/assets/themes/sandcastle/sandcastle.json +++ b/assets/themes/sandcastle/sandcastle.json @@ -46,7 +46,7 @@ "panel.background": "#2b3038ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fdf4c14c", + "scrollbar.thumb.background": "#fdf4c14c", "scrollbar.thumb.hover_background": "#313741ff", "scrollbar.thumb.border": "#313741ff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/solarized/solarized.json b/assets/themes/solarized/solarized.json index 217dddf4f7db2f019a2f31bde1ab420ca39c52db..c6e274860fb3f71239dfc0b3e7aed14aeb55dc8d 100644 --- a/assets/themes/solarized/solarized.json +++ b/assets/themes/solarized/solarized.json @@ -46,7 +46,7 @@ "panel.background": "#04313bff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#fdf6e34c", + "scrollbar.thumb.background": "#fdf6e34c", "scrollbar.thumb.hover_background": "#053541ff", "scrollbar.thumb.border": "#053541ff", "scrollbar.track.background": "#00000000", @@ -415,7 +415,7 @@ "panel.background": "#f3eddaff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#002a354c", + "scrollbar.thumb.background": "#002a354c", "scrollbar.thumb.hover_background": "#dcdacbff", "scrollbar.thumb.border": "#dcdacbff", "scrollbar.track.background": "#00000000", diff --git a/assets/themes/summercamp/summercamp.json b/assets/themes/summercamp/summercamp.json index 187d1fd23f649b56d0879a3962f1a812d7b43b1a..f46fb3774440b0ebd8577dfefbf1bbf02e0593d1 100644 --- a/assets/themes/summercamp/summercamp.json +++ b/assets/themes/summercamp/summercamp.json @@ -46,7 +46,7 @@ "panel.background": "#231f16ff", "panel.focused_border": null, "pane.focused_border": null, - "scrollbar_thumb.background": "#f8f5de4c", + "scrollbar.thumb.background": "#f8f5de4c", "scrollbar.thumb.hover_background": "#29251bff", "scrollbar.thumb.border": "#29251bff", "scrollbar.track.background": "#00000000", diff --git a/crates/theme/src/schema.rs b/crates/theme/src/schema.rs index 37fa235be7abb64dc5971299e04b4cd8d12fe0f8..87f71cc7ee3a1755cbbcfe52ec4324606c783e67 100644 --- a/crates/theme/src/schema.rs +++ b/crates/theme/src/schema.rs @@ -290,7 +290,10 @@ pub struct ThemeColorsContent { pub pane_focused_border: Option, /// The color of the scrollbar thumb. - #[serde(rename = "scrollbar_thumb.background")] + #[serde( + rename = "scrollbar.thumb.background", + alias = "scrollbar_thumb.background" + )] pub scrollbar_thumb_background: Option, /// The color of the scrollbar thumb when hovered over.