logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 33d92f9b16267415d1e62285a4f305ae10baf489
parent 7f513fe46fbf631190445b21b7cb4b7cb431d019
Author: Henry Jameson <me@hjkos.com>
Date:   Wed, 20 Apr 2022 23:55:34 +0300

relative units in line-height + some cleanup

Diffstat:

Msrc/App.scss6+++---
Msrc/components/notifications/notifications.scss3++-
Msrc/components/password_reset/password_reset.vue7++++---
Msrc/components/react_button/react_button.vue2+-
Msrc/components/status/status.scss4++--
Msrc/components/user_card/user_card.scss2+-
Msrc/components/user_profile/user_profile.vue2+-
Msrc/panel.scss2+-
8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/App.scss b/src/App.scss @@ -457,7 +457,7 @@ textarea, display: inline-block; position: relative; height: 2em; - line-height: 16px; + line-height: 1.2; hyphens: none; padding: 8px 0.5em; @@ -508,7 +508,7 @@ textarea, background-color: var(--input, $fallback--fg); vertical-align: top; text-align: center; - line-height: 1.1em; + line-height: 1.1; font-size: 1.1em; box-sizing: border-box; color: transparent; @@ -548,7 +548,7 @@ textarea, background-color: var(--input, $fallback--fg); vertical-align: top; text-align: center; - line-height: 1.1em; + line-height: 1.1; font-size: 1.1em; box-sizing: border-box; color: transparent; diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss @@ -155,7 +155,8 @@ margin: 0 0 0.3em; padding: 0; font-size: 1em; - line-height:20px; + line-height: 1.5; + small { font-weight: lighter; } diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue @@ -91,6 +91,7 @@ flex-direction: column; margin-top: 0.6em; max-width: 18rem; + > * { min-width: 0; } @@ -100,8 +101,8 @@ display: flex; flex-direction: column; margin-bottom: 1em; - padding: 0.3em 0.0em 0.3em; - line-height: 24px; + padding: 0.3em 0; + line-height: 1.85em; } .error { @@ -113,7 +114,7 @@ .alert { padding: 0.5em; - margin: 0.3em 0.0em 1em; + margin: 0.3em 0 1em; } .password-reset-required { diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue @@ -101,7 +101,7 @@ cursor: pointer; flex-basis: 20%; - line-height: 1.5em; + line-height: 1.5; align-content: center; &:hover { diff --git a/src/components/status/status.scss b/src/components/status/status.scss @@ -106,7 +106,7 @@ .heading-name-row { display: flex; justify-content: space-between; - line-height: 18px; + line-height: 1.3; a { display: inline-block; @@ -227,7 +227,7 @@ .replies { margin-top: 0.25em; - line-height: 18px; + line-height: 1.3; font-size: 0.85em; display: flex; flex-wrap: wrap; diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss @@ -55,7 +55,7 @@ &-bio { text-align: center; display: block; - line-height: 18px; + line-height: 1.3; padding: 1em; margin: 0; diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue @@ -176,7 +176,7 @@ } .user-profile-field-name, .user-profile-field-value { - line-height: 18px; + line-height: 1.3; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/src/panel.scss b/src/panel.scss @@ -195,7 +195,7 @@ } .panel-body > p { - line-height: 18px; + line-height: 1.3; padding: 1em; margin: 0; }