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

Use line-height: normal by default #26635

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Use line-height: normal by default #26635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47eccc6
fix
wxiaoguang Aug 21, 2023
19f5599
Merge branch 'main' into fix-line-height
wxiaoguang Aug 22, 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
6 changes: 1 addition & 5 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
--font-weight-semibold: 600;
--font-weight-bold: 700;
/* line-height: use the default value as "modules/normalize.css" */
--line-height-default: 1.15;
--line-height-default: normal;
/* 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 @@ -521,8 +521,6 @@ a.label,
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 */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will cause these elements to be slightly bigger than fomantic default, probably not an issue but I thought to restore previous heights with these, that's why I added them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UI has been quite different from official Fomantic UI for long time, I do not see the necessity to do pixel-level fine-tune for Fomantic UI

}

.ui.menu .item > .svg {
Expand Down Expand Up @@ -669,8 +667,6 @@ 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
2 changes: 1 addition & 1 deletion web_src/css/modules/normalize.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
}

Expand Down