Skip to content

fix(TopBar): align lines #12875

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

Merged
ShGKme merged 2 commits into from
Aug 6, 2024
Merged

fix(TopBar): align lines #12875

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
41e1e23
fix(TopBar): align with normal line-height and font-size
ShGKme Aug 1, 2024
3ad15eb
fix(CalLView): adjust position to new top bar height
ShGKme Aug 6, 2024
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
4 changes: 2 additions & 2 deletions src/components/CallView/CallView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,8 @@ export default {
#videos {
position: absolute;
width: 100%;
height: calc(100% - 60px);
top: 60px;
height: calc(100% - 50px);
top: 50px;
overflow: hidden;
display: -webkit-box;
display: -moz-box;
Expand Down
7 changes: 3 additions & 4 deletions src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,13 @@ export default {
<style lang="scss" scoped>
.top-bar {
--border-width: 1px;
// hardcoded 1.5 value of line-height for compatibility with older versions
--text-height: calc(1.5 * (var(--default-font-size) + var(--font-size-small, 15px)));
display: flex;
flex-wrap: wrap;
z-index: 10;
gap: 3px;
align-items: center;
justify-content: flex-end;
min-height: calc(2 * var(--default-grid-baseline) + var(--text-height) + var(--border-width));
min-height: calc(var(--border-width) + 2 * (2 * var(--default-grid-baseline)) + var(--default-clickable-area));
Copy link
Contributor

@Antreesy Antreesy Aug 6, 2024

Choose a reason for hiding this comment

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

Call Container uses magic number 60 or close, need to be updated to the same value there too

Copy link
Contributor Author

@ShGKme ShGKme Aug 6, 2024

Choose a reason for hiding this comment

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

Done in a hotfix

Copy link
Contributor

@Antreesy Antreesy Aug 6, 2024

Choose a reason for hiding this comment

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

Ok, but I thought, we're going for variables)

Copy link
Contributor Author

@ShGKme ShGKme Aug 6, 2024

Choose a reason for hiding this comment

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

I found it more complex and risky. CallView is used in different entrypoints and not directly related to TopBar

padding-block: var(--default-grid-baseline);
// Reserve space for the sidebar toggle button
padding-inline: calc(2 * var(--default-grid-baseline)) calc(2 * var(--default-grid-baseline) + var(--app-sidebar-offset, 0));
Expand Down Expand Up @@ -361,6 +359,8 @@ export default {
justify-content: center;
width: 100%;
overflow: hidden;
// Text is guaranteed to be one line. Make line-height 1.2 to fit top bar
line-height: 1.2;
&--offline {
color: var(--color-text-maxcontrast);
}
Expand All @@ -371,7 +371,6 @@ export default {
text-overflow: ellipsis;
}
.description {
font-size: var(--font-size-small, 15px);
overflow: hidden;
text-overflow: ellipsis;
max-width: fit-content;
Expand Down