mirror
/
fractal
mirror of https://gitlab.gnome.org/World/fractal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

misc: Do not change line height 

It makes the text blurry on non-HiDPI screens.
This change is temporary for the Fractal 5 release.
merge-requests/1461/head
Kévin Commaille 2 years ago
parent
d6d2c43c71
commit
9d0409124c
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
8 changed files with 0 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      data/resources/style.css
  2. 1
      src/components/label_with_widgets.rs
  3. 21
      src/error_page.ui
  4. 6
      src/session/view/account_settings/security_page/import_export_keys_subpage.ui
  5. 6
      src/session/view/account_settings/user_page/change_password_subpage.ui
  6. 6
      src/session/view/account_settings/user_page/deactivate_account_subpage.ui
  7. 6
      src/session/view/account_settings/user_page/log_out_subpage.ui
  8. 1
      src/session/view/content/room_history/message_row/text.rs

9
data/resources/style.css
Unescape View File

@ -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;

1
src/components/label_with_widgets.rs
Unescape View File

@ -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) {

21
src/error_page.ui
Unescape View File

@ -30,9 +30,6 @@
<property name="spacing">24</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property>
<property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property>
@ -45,9 +42,6 @@
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property>
<property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property>
@ -59,18 +53,12 @@
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="valign">start</property>
<property name="label">•</property>
</object>
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property>
<property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property>
@ -84,18 +72,12 @@
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="valign">start</property>
<property name="label">•</property>
</object>
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property>
<property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property>
@ -108,9 +90,6 @@
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="wrap">true</property>
<property name="wrap-mode">word-char</property>
<property name="xalign">0.0</property>

6
src/session/view/account_settings/security_page/import_export_keys_subpage.ui
Unescape View File

@ -28,9 +28,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="description">
<style>
<class name="large-line-height"/>
</style>
<property name="label"></property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
@ -39,9 +36,6 @@
</child>
<child>
<object class="GtkLabel" id="instructions">
<style>
<class name="large-line-height"/>
</style>
<property name="label"></property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/change_password_subpage.ui
Unescape View File

@ -38,9 +38,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Changing your password will log you out of your other sessions.</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">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.</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/deactivate_account_subpage.ui
Unescape View File

@ -38,9 +38,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Deactivating your account means you will lose access to all your messages, contacts, files, and more, forever.</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">To confirm that you really want to deactivate this account, type in your Matrix user ID:</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>

6
src/session/view/account_settings/user_page/log_out_subpage.ui
Unescape View File

@ -38,9 +38,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">Fractal doesn’t support online backup of room encryption keys so you might lose access to your encrypted message history.</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>
@ -49,9 +46,6 @@
</child>
<child>
<object class="GtkLabel">
<style>
<class name="large-line-height"/>
</style>
<property name="label" translatable="yes">It is recommended to backup your encryption keys before proceeding.</property>
<property name="wrap">True</property>
<property name="wrap-mode">word-char</property>

1
src/session/view/content/room_history/message_row/text.rs
Unescape View File

@ -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()
}

Write Preview
Loading…
Cancel
Save