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

Re-enable hover styles

Browse source
This commit is contained in:
Marshall Bowers 2023-10-10 11:48:25 -04:00
parent 40d58c9bc3
commit 8f7f38536d
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/storybook2/src/collab_panel.rs
View file

@ -159,8 +159,8 @@ impl CollabPanel {
.px_2() .px_2()
.flex() .flex()
.items_center() .items_center()
// .hover() .hover()
// .fill(theme.lowest.variant.hovered.background) .fill(theme.lowest.variant.hovered.background)
// .active() // .active()
// .fill(theme.lowest.variant.pressed.background) // .fill(theme.lowest.variant.pressed.background)
.child( .child(

30
crates/storybook2/src/workspace.rs
View file

@ -2,7 +2,7 @@ use gpui3::{
div, img, svg, view, Context, Element, ParentElement, RootView, StyleHelpers, View, div, img, svg, view, Context, Element, ParentElement, RootView, StyleHelpers, View,
ViewContext, WindowContext, ViewContext, WindowContext,
}; };
use ui::{prelude::*}; use ui::prelude::*;
use ui::{themed, Panel, Stack}; use ui::{themed, Panel, Stack};
use crate::{ use crate::{
@ -182,8 +182,8 @@ impl Titlebar {
.justify_center() .justify_center()
.px_2() .px_2()
.rounded_md() .rounded_md()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child(div().text_sm().child("project")), .child(div().text_sm().child("project")),
@ -197,8 +197,8 @@ impl Titlebar {
.px_2() .px_2()
.rounded_md() .rounded_md()
.text_color(theme.lowest.variant.default.foreground) .text_color(theme.lowest.variant.default.foreground)
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(
@ -253,8 +253,8 @@ impl Titlebar {
.flex() .flex()
.items_center() .items_center()
.justify_center() .justify_center()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(
@ -273,8 +273,8 @@ impl Titlebar {
.flex() .flex()
.items_center() .items_center()
.justify_center() .justify_center()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(
@ -293,8 +293,8 @@ impl Titlebar {
.flex() .flex()
.items_center() .items_center()
.justify_center() .justify_center()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(
@ -318,8 +318,8 @@ impl Titlebar {
.justify_center() .justify_center()
.rounded_md() .rounded_md()
.gap_0p5() .gap_0p5()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(
@ -435,8 +435,8 @@ mod statusbar {
.gap_0p5() .gap_0p5()
.px_1() .px_1()
.text_color(theme.lowest.variant.default.foreground) .text_color(theme.lowest.variant.default.foreground)
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child( .child(

4
crates/ui2/src/components/breadcrumb.rs
View file

@ -43,8 +43,8 @@ impl<S: 'static + Send + Sync + Clone> Breadcrumb<S> {
.text_sm() .text_sm()
.text_color(theme.middle.base.default.foreground) .text_color(theme.middle.base.default.foreground)
.rounded_md() .rounded_md()
// .hover() .hover()
// .fill(theme.highest.base.hovered.background) .fill(theme.highest.base.hovered.background)
.child(self.path.clone().to_str().unwrap().to_string()) .child(self.path.clone().to_str().unwrap().to_string())
.child(if !self.symbols.is_empty() { .child(if !self.symbols.is_empty() {
self.render_separator(&theme) self.render_separator(&theme)

4
crates/ui2/src/components/collab_panel.rs
View file

@ -137,8 +137,8 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
.px_2() .px_2()
.flex() .flex()
.items_center() .items_center()
// .hover() .hover()
// .fill(theme.lowest.variant.hovered.background) .fill(theme.lowest.variant.hovered.background)
// .active() // .active()
// .fill(theme.lowest.variant.pressed.background) // .fill(theme.lowest.variant.pressed.background)
.child( .child(

4
crates/ui2/src/components/icon_button.rs
View file

@ -62,8 +62,8 @@ impl<S: 'static + Send + Sync> IconButton<S> {
.items_center() .items_center()
.justify_center() .justify_center()
.rounded_md() .rounded_md()
// .hover() .hover()
// .fill(theme.highest.base.hovered.background) .fill(theme.highest.base.hovered.background)
// .active() // .active()
// .fill(theme.highest.base.pressed.background) // .fill(theme.highest.base.pressed.background)
.child(IconElement::new(self.icon).color(icon_color)) .child(IconElement::new(self.icon).color(icon_color))

4
crates/ui2/src/components/palette.rs
View file

@ -89,8 +89,8 @@ impl<S: 'static + Send + Sync + Clone> Palette<S> {
.px_2() .px_2()
.py_0p5() .py_0p5()
.rounded_lg() .rounded_lg()
// .hover() .hover()
// .fill(theme.lowest.base.hovered.background) .fill(theme.lowest.base.hovered.background)
// .active() // .active()
// .fill(theme.lowest.base.pressed.background) // .fill(theme.lowest.base.pressed.background)
.child(item.clone()) .child(item.clone())

4
crates/ui2/src/elements/input.rs
View file

@ -90,8 +90,8 @@ impl<S: 'static + Send + Sync> Input<S> {
.border() .border()
.border_color(border_color_default) .border_color(border_color_default)
.fill(background_color_default) .fill(background_color_default)
// .hover() .hover()
// .border_color(border_color_hover) .border_color(border_color_hover)
// .active() // .active()
// .border_color(border_color_active) // .border_color(border_color_active)
.fill(background_color_active) .fill(background_color_active)

2
crates/ui2/src/prelude.rs
View file

@ -1,5 +1,5 @@
pub use gpui3::{ pub use gpui3::{
div, Element, IntoAnyElement, ParentElement, ScrollState, StyleHelpers, ViewContext, div, Element, IntoAnyElement, ParentElement, ScrollState, StyleHelpers, Styled, ViewContext,
WindowContext, WindowContext,
}; };