Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into nate/storybook-components

Browse source
This commit is contained in:
Nate Butler 2023-09-11 11:49:49 -04:00
commit c7ad89d7fa
71 changed files with 966 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/storybook/src/theme.rs
View file

@ -1,7 +1,6 @@
use gpui2::{
color::Hsla,
element::{Element, PaintContext},
serde_json, AppContext, IntoElement, Vector2F, ViewContext, WindowContext,
color::Hsla, element::Element, serde_json, AppContext, IntoElement, Vector2F, ViewContext,
WindowContext,
};
use serde::{de::Visitor, Deserialize, Deserializer};
use std::{collections::HashMap, fmt, marker::PhantomData};
@ -162,7 +161,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
parent_origin: Vector2F,
layout: &gpui2::Layout,
state: &mut Self::PaintState,
cx: &mut PaintContext<V>,
cx: &mut ViewContext<V>,
) where
Self: Sized,
{