From c078f017ed5eb7d93bed51d8a3d0d2f2fdcced64 Mon Sep 17 00:00:00 2001 From: Mike Sawka Date: Tue, 5 Mar 2024 14:36:39 -0800 Subject: [PATCH] align line-actions, scale with terminal font size (#382) --- src/app/app.less | 2 -- src/app/line/line.less | 13 ++++++++----- src/app/sidebar/sidebar.less | 1 + src/app/workspace/screen/tabs.less | 2 ++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/app.less b/src/app/app.less index 1d2a642ea..59541aa26 100644 --- a/src/app/app.less +++ b/src/app/app.less @@ -144,8 +144,6 @@ svg.icon { } .scrollbar-hide-until-hover { - overflow: scroll; - &::-webkit-scrollbar-thumb, &::-webkit-scrollbar-track { display: none; diff --git a/src/app/line/line.less b/src/app/line/line.less index 614a5c71a..3598d5a0e 100644 --- a/src/app/line/line.less +++ b/src/app/line/line.less @@ -147,14 +147,17 @@ .line-actions { position: absolute; - right: calc(var(--termpad) * 2); - top: 0; - font-size: 14px; color: var(--line-actions-inactive-color); border-radius: 4px; padding-left: 4px; padding-right: 4px; - line-height: 1.2; + font-size: var(--termfontsize); + line-height: var(--termlineheight); + + // we want to align to 2nd line of meta. that's 2xPad + 1xLineHightSm + // height of actions is 1xLineHeight + 8px (2x2px padding on icons) + top: calc(var(--termpad) * 2 + var(--termlineheight-sm) - var(--termlineheight) - 8px); + right: calc(var(--termpad) * 2 + var(--termlineheight-sm) - var(--termlineheight) - 8px); display: flex; flex-direction: row; @@ -171,7 +174,7 @@ color: var(--line-actions-active-color); } - padding: 4px; + padding: 4px 4px; cursor: pointer; } diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less index d504be774..1db4345fd 100644 --- a/src/app/sidebar/sidebar.less +++ b/src/app/sidebar/sidebar.less @@ -63,6 +63,7 @@ .middle { padding: 4px 6px 8px 6px; border-bottom: 1px solid var(--app-border-color); + overflow-y: auto; .item { &.active { background-color: var(--sidebar-highlight-color); diff --git a/src/app/workspace/screen/tabs.less b/src/app/workspace/screen/tabs.less index 708da99d5..4c6be25aa 100644 --- a/src/app/workspace/screen/tabs.less +++ b/src/app/workspace/screen/tabs.less @@ -98,6 +98,8 @@ display: flex; flex-direction: row; position: relative; + border-top: 2px solid transparent; + .background { // This applies a transparency mask to the background color, as set above, so that it will blend with whatever the theme's background color is. z-index: 1;