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

WIP

Browse source 
[no-ci]
This commit is contained in:
Nate Butler 2023-12-07 10:50:07 -05:00
parent f798b193d0
commit 5e5eb25aab
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/feedback2/src/feedback_modal.rs
View file

@ -104,6 +104,11 @@ impl FeedbackModal {
let feedback_editor = cx.build_view(|cx| { let feedback_editor = cx.build_view(|cx| {
let mut editor = Editor::for_buffer(buffer, Some(project.clone()), cx); let mut editor = Editor::for_buffer(buffer, Some(project.clone()), cx);
editor.set_placeholder_text(
"You can use markdown to add links or organize feedback.",
cx,
);
// editor.set_show_gutter(false, cx);
editor.set_vertical_scroll_margin(5, cx); editor.set_vertical_scroll_margin(5, cx);
editor editor
}); });
@ -292,19 +297,21 @@ impl Render for FeedbackModal {
.min_w(rems(40.)) .min_w(rems(40.))
.max_w(rems(96.)) .max_w(rems(96.))
.h(rems(32.)) .h(rems(32.))
.p_4()
.gap_4()
.child( .child(
v_stack() v_stack()
.px_4() .child(
.pt_4() // TODO: Add Headline component to `ui2`
.pb_2() div().text_xl().child("Share Feedback"))
.child(Label::new("Give Feedback").color(Color::Default))
.child(Label::new("This editor supports markdown").color(Color::Muted)),
) )
.child( .child(
div() div()
.flex_1() .flex_1()
.bg(cx.theme().colors().editor_background) .bg(cx.theme().colors().editor_background)
.p_2()
.border() .border()
.rounded_md()
.border_color(cx.theme().colors().border) .border_color(cx.theme().colors().border)
.child(self.feedback_editor.clone()), .child(self.feedback_editor.clone()),
) )
@ -330,19 +337,18 @@ impl Render for FeedbackModal {
} }
) )
) )
.child(
v_stack()
.p_4()
.child( .child(
h_stack() h_stack()
.bg(cx.theme().colors().editor_background) .bg(cx.theme().colors().editor_background)
.p_2()
.border() .border()
.rounded_md()
.border_color(cx.theme().colors().border) .border_color(cx.theme().colors().border)
.child(self.email_address_editor.clone())) .child(self.email_address_editor.clone()))
)
.child( .child(
h_stack() h_stack()
.p_4()
.justify_between() .justify_between()
.gap_1() .gap_1()
.child(Button::new("community_repo", "Community Repo") .child(Button::new("community_repo", "Community Repo")

1
crates/ui2/src/components/button/button.rs
View file

@ -158,7 +158,6 @@ impl RenderOnce for Button {
this this
} }
}) })
.flex_row_reverse()
.child( .child(
Label::new(label) Label::new(label)
.color(label_color) .color(label_color)