Break typography styles out of StyledExt
(#11013)
- Centralizes typography-related UI styles and methods in `styles/typography.rs` - Breaks the typography-related styles out of `StyledExt`. This means we add a `StyledTypography` trait – this should more or less be an invisible change as we publish it in the prelude. - adds the ability to easily grab the UI or Buffer font sizes (`ui_font_size`, `buffer_font_size`) with `TextSize::UI`, `TextSize::Editor` Release Notes: - N/A
This commit is contained in:
parent
4c780568bc
commit
366d7e7728
11 changed files with 100 additions and 84 deletions
|
@ -315,7 +315,7 @@ impl ChatPanel {
|
|||
None => {
|
||||
return div().child(
|
||||
h_flex()
|
||||
.text_ui_xs()
|
||||
.text_ui_xs(cx)
|
||||
.my_0p5()
|
||||
.px_0p5()
|
||||
.gap_x_1()
|
||||
|
@ -350,7 +350,7 @@ impl ChatPanel {
|
|||
div().child(
|
||||
h_flex()
|
||||
.id(message_element_id)
|
||||
.text_ui_xs()
|
||||
.text_ui_xs(cx)
|
||||
.my_0p5()
|
||||
.px_0p5()
|
||||
.gap_x_1()
|
||||
|
@ -495,7 +495,7 @@ impl ChatPanel {
|
|||
|this| {
|
||||
this.child(
|
||||
h_flex()
|
||||
.text_ui_sm()
|
||||
.text_ui_sm(cx)
|
||||
.child(
|
||||
div().absolute().child(
|
||||
Avatar::new(message.sender.avatar_uri.clone())
|
||||
|
@ -539,7 +539,7 @@ impl ChatPanel {
|
|||
el.child(
|
||||
v_flex()
|
||||
.w_full()
|
||||
.text_ui_sm()
|
||||
.text_ui_sm(cx)
|
||||
.id(element_id)
|
||||
.child(text.element("body".into(), cx)),
|
||||
)
|
||||
|
@ -562,7 +562,7 @@ impl ChatPanel {
|
|||
div()
|
||||
.px_1()
|
||||
.rounded_md()
|
||||
.text_ui_xs()
|
||||
.text_ui_xs(cx)
|
||||
.bg(cx.theme().colors().background)
|
||||
.child("New messages"),
|
||||
)
|
||||
|
@ -1003,7 +1003,7 @@ impl Render for ChatPanel {
|
|||
el.child(
|
||||
h_flex()
|
||||
.px_2()
|
||||
.text_ui_xs()
|
||||
.text_ui_xs(cx)
|
||||
.justify_between()
|
||||
.border_t_1()
|
||||
.border_color(cx.theme().colors().border)
|
||||
|
|
|
@ -18,7 +18,7 @@ use project::{search::SearchQuery, Completion};
|
|||
use settings::Settings;
|
||||
use std::{ops::Range, sync::Arc, time::Duration};
|
||||
use theme::ThemeSettings;
|
||||
use ui::{prelude::*, UiTextSize};
|
||||
use ui::{prelude::*, TextSize};
|
||||
|
||||
use crate::panel_settings::MessageEditorSettings;
|
||||
|
||||
|
@ -523,7 +523,7 @@ impl Render for MessageEditor {
|
|||
},
|
||||
font_family: settings.ui_font.family.clone(),
|
||||
font_features: settings.ui_font.features,
|
||||
font_size: UiTextSize::Small.rems().into(),
|
||||
font_size: TextSize::Small.rems(cx).into(),
|
||||
font_weight: FontWeight::NORMAL,
|
||||
font_style: FontStyle::Normal,
|
||||
line_height: relative(1.3),
|
||||
|
|
|
@ -34,7 +34,7 @@ impl ParentElement for CollabNotification {
|
|||
impl RenderOnce for CollabNotification {
|
||||
fn render(self, cx: &mut WindowContext) -> impl IntoElement {
|
||||
h_flex()
|
||||
.text_ui()
|
||||
.text_ui(cx)
|
||||
.justify_between()
|
||||
.size_full()
|
||||
.overflow_hidden()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue