From 4da20765e8b0a8f9be1e16ee6b8f4fe96bee10ed Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 24 Aug 2023 18:39:09 +0800 Subject: [PATCH] Backport line height fix (#26708) Backport the `line-height: normal`, because #26520 was backported (cherry picked from commit 508c624e996d33ad735327bc4583b990adf94d16) --- web_src/css/admin.css | 2 +- web_src/css/base.css | 9 ++++++--- web_src/css/modules/normalize.css | 2 +- web_src/css/repo.css | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 1423b651dd..77dae54974 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -45,7 +45,7 @@ .admin dl.admin-dl-horizontal dt, .admin dl.admin-dl-horizontal dd { - line-height: 1; + line-height: var(--line-height-default); padding: 5px 0; } diff --git a/web_src/css/base.css b/web_src/css/base.css index 556bee0d1a..60803de6d9 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -9,6 +9,8 @@ --font-weight-medium: 500; --font-weight-semibold: 600; --font-weight-bold: 700; + /* line-height: use the default value as "modules/normalize.css" */ + --line-height-default: normal; /* backgrounds */ --checkbox-mask-checked: url('data:image/svg+xml;utf8,'); --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,'); @@ -509,6 +511,7 @@ a.label, .ui.menu .item { color: var(--color-text); user-select: auto; + line-height: var(--line-height-default); /* fomantic uses "1" which causes overflow problems because "1" doesn't consider the descent part */ } .ui.menu .item > .svg { @@ -1517,7 +1520,7 @@ img.ui.avatar, height: 3em; float: none; display: block; - line-height: 1; + line-height: var(--line-height-default); padding: 0; margin: 0 auto 0.5rem; opacity: 1; @@ -2170,7 +2173,7 @@ table th[data-sortt-desc] .svg { .emoji, .reaction { font-size: 1.25em; - line-height: 1; + line-height: var(--line-height-default); font-style: normal !important; font-weight: var(--font-weight-normal) !important; vertical-align: -0.075em; @@ -2294,7 +2297,7 @@ table th[data-sortt-desc] .svg { } .ui.dropdown { - line-height: 1em; /* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */ + line-height: var(--line-height-default); /* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */ } /* dropdown has some kinds of icons: diff --git a/web_src/css/modules/normalize.css b/web_src/css/modules/normalize.css index 406869f7fb..9f9856aa90 100644 --- a/web_src/css/modules/normalize.css +++ b/web_src/css/modules/normalize.css @@ -25,7 +25,7 @@ Use a better box model (opinionated). } html { - line-height: 1.15; /* 1. Correct the line height in all browsers. */ + line-height: normal; /* 1. (not following the "modern-normalize") Do not change the browser's default line-height, the default value is font-dependent and roughly 1.2 */ -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */ } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index b5a14e8f72..ebd6ffa230 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -403,8 +403,8 @@ } .repository.file.list .non-diff-file-content .header .file-actions .btn-octicon { - line-height: 1; - padding: 10px 8px; + line-height: var(--line-height-default); + padding: 8px; vertical-align: middle; color: var(--color-text); }