diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs index 1bcad0e0..fb0faa56 100644 --- a/src/home/room_screen.rs +++ b/src/home/room_screen.rs @@ -67,10 +67,6 @@ live_design! { ICO_LOCATION_PERSON = dep("crate://self/resources/icons/location-person.svg") - TEXT_SUB = { - font_size: (10), - } - COLOR_BG = #xfff8ee COLOR_BRAND = #x5 COLOR_BRAND_HOVER = #x3 diff --git a/src/shared/styles.rs b/src/shared/styles.rs index 8546ec7f..32dd470f 100644 --- a/src/shared/styles.rs +++ b/src/shared/styles.rs @@ -18,16 +18,9 @@ live_design! { } TEXT_SUB = { - font_size: (8), - height_factor: 1.5, - } - - TEXT_P = { - font_size: (12), - height_factor: 1.65, + font_size: (10), } - USERNAME_FONT_SIZE = 11 USERNAME_TEXT_COLOR = #x2 USERNAME_TEXT_STYLE = { @@ -53,9 +46,7 @@ live_design! { SMALL_STATE_FONT_SIZE = 9.0 SMALL_STATE_TEXT_COLOR = #x888 - SMALL_STATE_TEXT_STYLE = { - font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}, - font2: { path: dep("crate://makepad-widgets/resources/LXGWWenKaiRegular.ttf") }, + SMALL_STATE_TEXT_STYLE = { font_size: (SMALL_STATE_FONT_SIZE), height_factor: 1.3, }