From 9d0409124cb488b11dd1d744fec0f65d017e5239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 21 Nov 2023 10:34:17 +0100 Subject: [PATCH] misc: Do not change line height It makes the text blurry on non-HiDPI screens. This change is temporary for the Fractal 5 release. --- data/resources/style.css | 9 -------- src/components/label_with_widgets.rs | 1 - src/error_page.ui | 21 ------------------- .../import_export_keys_subpage.ui | 6 ------ .../user_page/change_password_subpage.ui | 6 ------ .../user_page/deactivate_account_subpage.ui | 6 ------ .../user_page/log_out_subpage.ui | 6 ------ .../content/room_history/message_row/text.rs | 1 - 8 files changed, 56 deletions(-) diff --git a/data/resources/style.css b/data/resources/style.css index cc2847e7..ea4d7319 100644 --- a/data/resources/style.css +++ b/data/resources/style.css @@ -9,10 +9,6 @@ textview, text { font-weight: bold; } -.line-height { - line-height: 150%; -} - button.pill.large { padding: 12px 40px; } @@ -48,11 +44,6 @@ button.opaque.success { color: @error_bg_color; } -preferencesgroup .body, -.large-line-height { - line-height: 140%; -} - button.row { min-height: 34px; border-radius: 12px; diff --git a/src/components/label_with_widgets.rs b/src/components/label_with_widgets.rs index 3e643eb2..3d61d1c6 100644 --- a/src/components/label_with_widgets.rs +++ b/src/components/label_with_widgets.rs @@ -83,7 +83,6 @@ mod imp { label.set_wrap_mode(pango::WrapMode::WordChar); label.set_xalign(0.0); label.set_valign(gtk::Align::Start); - label.add_css_class("line-height"); } fn dispose(&self) { diff --git a/src/error_page.ui b/src/error_page.ui index 57f85774..7f8ac47e 100644 --- a/src/error_page.ui +++ b/src/error_page.ui @@ -30,9 +30,6 @@ 24 - true word-char 0.0 @@ -45,9 +42,6 @@ 12 - true word-char 0.0 @@ -59,18 +53,12 @@ 6 - start • - true word-char 0.0 @@ -84,18 +72,12 @@ 6 - start • - true word-char 0.0 @@ -108,9 +90,6 @@ - true word-char 0.0 diff --git a/src/session/view/account_settings/security_page/import_export_keys_subpage.ui b/src/session/view/account_settings/security_page/import_export_keys_subpage.ui index ccf64604..b0f13a4f 100644 --- a/src/session/view/account_settings/security_page/import_export_keys_subpage.ui +++ b/src/session/view/account_settings/security_page/import_export_keys_subpage.ui @@ -28,9 +28,6 @@ vertical - True word-char @@ -39,9 +36,6 @@ - True word-char diff --git a/src/session/view/account_settings/user_page/change_password_subpage.ui b/src/session/view/account_settings/user_page/change_password_subpage.ui index 38e96f70..6ba265e7 100644 --- a/src/session/view/account_settings/user_page/change_password_subpage.ui +++ b/src/session/view/account_settings/user_page/change_password_subpage.ui @@ -38,9 +38,6 @@ vertical - Changing your password will log you out of your other sessions. True word-char @@ -49,9 +46,6 @@ - Fractal’s support for encryption is unstable so you might lose access to your encrypted message history. It is recommended to backup your encryption keys before proceeding. True word-char diff --git a/src/session/view/account_settings/user_page/deactivate_account_subpage.ui b/src/session/view/account_settings/user_page/deactivate_account_subpage.ui index f7273cc0..ed48156d 100644 --- a/src/session/view/account_settings/user_page/deactivate_account_subpage.ui +++ b/src/session/view/account_settings/user_page/deactivate_account_subpage.ui @@ -38,9 +38,6 @@ vertical - Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever. True word-char @@ -49,9 +46,6 @@ - To confirm that you really want to deactivate this account, type in your Matrix user ID: True word-char diff --git a/src/session/view/account_settings/user_page/log_out_subpage.ui b/src/session/view/account_settings/user_page/log_out_subpage.ui index 2a37d2ba..8f941b00 100644 --- a/src/session/view/account_settings/user_page/log_out_subpage.ui +++ b/src/session/view/account_settings/user_page/log_out_subpage.ui @@ -38,9 +38,6 @@ vertical - Fractal doesn’t support online backup of room encryption keys so you might lose access to your encrypted message history. True word-char @@ -49,9 +46,6 @@ - It is recommended to backup your encryption keys before proceeding. True word-char diff --git a/src/session/view/content/room_history/message_row/text.rs b/src/session/view/content/room_history/message_row/text.rs index d639c0ac..277c2588 100644 --- a/src/session/view/content/room_history/message_row/text.rs +++ b/src/session/view/content/room_history/message_row/text.rs @@ -532,7 +532,6 @@ fn new_label() -> gtk::Label { .wrap_mode(pango::WrapMode::WordChar) .xalign(0.0) .valign(gtk::Align::Start) - .css_classes(["line-height"]) .build() }