Backport line height fix (#26708)

Backport the `line-height: normal`, because #26520 was backported

(cherry picked from commit 508c624e996d33ad735327bc4583b990adf94d16)
This commit is contained in:
wxiaoguang 2023-08-24 18:39:09 +08:00 committed by Earl Warren
parent 03b397a408
commit 4da20765e8
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
4 changed files with 10 additions and 7 deletions

View file

@ -45,7 +45,7 @@
.admin dl.admin-dl-horizontal dt, .admin dl.admin-dl-horizontal dt,
.admin dl.admin-dl-horizontal dd { .admin dl.admin-dl-horizontal dd {
line-height: 1; line-height: var(--line-height-default);
padding: 5px 0; padding: 5px 0;
} }

View file

@ -9,6 +9,8 @@
--font-weight-medium: 500; --font-weight-medium: 500;
--font-weight-semibold: 600; --font-weight-semibold: 600;
--font-weight-bold: 700; --font-weight-bold: 700;
/* line-height: use the default value as "modules/normalize.css" */
--line-height-default: normal;
/* backgrounds */ /* backgrounds */
--checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>'); --checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>'); --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
@ -509,6 +511,7 @@ a.label,
.ui.menu .item { .ui.menu .item {
color: var(--color-text); color: var(--color-text);
user-select: auto; 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 { .ui.menu .item > .svg {
@ -1517,7 +1520,7 @@ img.ui.avatar,
height: 3em; height: 3em;
float: none; float: none;
display: block; display: block;
line-height: 1; line-height: var(--line-height-default);
padding: 0; padding: 0;
margin: 0 auto 0.5rem; margin: 0 auto 0.5rem;
opacity: 1; opacity: 1;
@ -2170,7 +2173,7 @@ table th[data-sortt-desc] .svg {
.emoji, .emoji,
.reaction { .reaction {
font-size: 1.25em; font-size: 1.25em;
line-height: 1; line-height: var(--line-height-default);
font-style: normal !important; font-style: normal !important;
font-weight: var(--font-weight-normal) !important; font-weight: var(--font-weight-normal) !important;
vertical-align: -0.075em; vertical-align: -0.075em;
@ -2294,7 +2297,7 @@ table th[data-sortt-desc] .svg {
} }
.ui.dropdown { .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: /* dropdown has some kinds of icons:

View file

@ -25,7 +25,7 @@ Use a better box model (opinionated).
} }
html { 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. */ -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
} }

View file

@ -403,8 +403,8 @@
} }
.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon { .repository.file.list .non-diff-file-content .header .file-actions .btn-octicon {
line-height: 1; line-height: var(--line-height-default);
padding: 10px 8px; padding: 8px;
vertical-align: middle; vertical-align: middle;
color: var(--color-text); color: var(--color-text);
} }