Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix various line-height styles #26553

Merged
merged 3 commits into from
Aug 17, 2023
Merged

Fix various line-height styles #26553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21b82cc
fix
wxiaoguang Aug 17, 2023
9ba7096
padding tweaks
silverwind Aug 17, 2023
a9d8fa0
Merge branch 'main' into fix-line-height
GiteaBot Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web_src/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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;
}

Expand Down
13 changes: 10 additions & 3 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.15;
/* 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-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>');
Expand Down Expand Up @@ -518,6 +520,9 @@ 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 */
padding-top: 11px; /* counteract line-height change */
padding-bottom: 11px; /* counteract line-height change */
}
silverwind marked this conversation as resolved.
Show resolved Hide resolved

.ui.menu .item > .svg {
Expand Down Expand Up @@ -664,6 +669,8 @@ a.label,
.ui.secondary.menu .item {
margin-left: 0;
margin-right: 0;
padding-top: 10px; /* counteract line-height change */
padding-bottom: 10px; /* counteract line-height change */
}

.ui.secondary.menu .dropdown.item:hover,
Expand Down Expand Up @@ -1476,7 +1483,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;
Expand Down Expand Up @@ -2124,7 +2131,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;
Expand Down Expand Up @@ -2247,7 +2254,7 @@ table th[data-sortt-desc] .svg {
}

.ui.dropdown {
line-height: 1; /* 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:
Expand Down
4 changes: 2 additions & 2 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,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);
}
Expand Down