Checkpoint

This commit is contained in:
Nathan Sobo 2023-09-05 12:50:07 -06:00
parent 9ec7569e09
commit e08c0fc4ce
7 changed files with 61 additions and 56 deletions

View file

@ -19,7 +19,7 @@ impl<V: 'static> CollabPanelElement<V> {
div()
.full()
.font("Zed Mono")
.font("Zed Sans")
.text_color(theme.middle.variant.default.foreground)
.fill(theme.middle.base.default.background)
.py_2()

View file

@ -1,6 +1,6 @@
use gpui2::{
elements::div, elements::text::ArcCow, interactive::Interactive, platform::MouseButton,
style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext,
elements::div, interactive::Interactive, platform::MouseButton, style::StyleHelpers, ArcCow,
Element, IntoElement, ParentElement, ViewContext,
};
use std::{marker::PhantomData, rc::Rc};

View file

@ -44,7 +44,7 @@ fn storybook<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
collab_panel().themed(current_theme(cx))
}
// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
// Nathan: During the transition to gpui2, we will include the base theme on the legacy Theme struct.
fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
settings::get::<ThemeSettings>(cx)
.theme