diff --git a/public/fonts/lato-bold.woff b/public/fonts/lato-bold.woff new file mode 100644 index 000000000..84c1cf303 Binary files /dev/null and b/public/fonts/lato-bold.woff differ diff --git a/public/fonts/lato-regular.woff b/public/fonts/lato-regular.woff new file mode 100644 index 000000000..f8b6d3ecb Binary files /dev/null and b/public/fonts/lato-regular.woff differ diff --git a/src/app/app.less b/src/app/app.less index 416a9a007..3685a3005 100644 --- a/src/app/app.less +++ b/src/app/app.less @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 @import "./root.less"; +@import "./overrides.less"; html, body { @@ -153,6 +154,12 @@ svg.icon { background-color: var(--scrollbar-thumb-hover-color) !important; } +.no-highlight-scrollbar { + &::-webkit-scrollbar-thumb:hover { + background-color: var(--scrollbar-thumb-color) !important; + } +} + .hide-scrollbar { &::-webkit-scrollbar { display: none; diff --git a/src/app/overrides.less b/src/app/overrides.less new file mode 100644 index 000000000..5ea546b0f --- /dev/null +++ b/src/app/overrides.less @@ -0,0 +1,16 @@ +// Copyright 2024, Command Line Inc. +// SPDX-License-Identifier: Apache-2.0 + +:root { + // can put dev overrides for testing here + + --label-font-family: "Lato", sans-serif; + + --sidebar-font-size: 15px; + --sidebar-font-weight: normal; + --sidebar-highlight-font-weight: bold; + + --screentabs-font-size: 15px; + --screentabs-font-weight: normal; + --screentabs-selected-font-weight: bold; +} diff --git a/src/app/root.less b/src/app/root.less index b3b451746..597654275 100644 --- a/src/app/root.less +++ b/src/app/root.less @@ -16,9 +16,15 @@ --text-s1-font: "Martian Mono", sans-serif; --markdown-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; + --label-font-family: "Martian Mono", sans-serif; - // magic - --screentabs-height: 38px; + --markdown-font-size: 14px; + + --screentabs-height: 38px; // magic + --screentabs-line-height: 21px; // magic + --screentabs-font-size: 12.5px; + --screentabs-font-weight: 300; + --screentabs-selected-font-weight: 300; // global colors --app-accent-color: rgb(88, 193, 66); @@ -139,6 +145,10 @@ --sidebar-settings-color: rgb(255, 255, 255); --sidebar-separator-color: var(--app-border-color); --sidebar-highlight-color: rgba(241, 246, 243, 0.08); + --sidebar-font-size: 12.5px; + --sidebar-line-height: 1.5; + --sidebar-font-weight: 300; + --sidebar-highlight-font-weight: 300; // line colors --line-sidebar-message-color: rgb(196, 160, 0); diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less index 5f03a9905..feaf29baa 100644 --- a/src/app/sidebar/sidebar.less +++ b/src/app/sidebar/sidebar.less @@ -12,6 +12,9 @@ border-radius: var(--app-border-radius) 0 0 var(--app-border-radius); border-left: 1px solid var(--app-border-color); border-bottom: 1px solid var(--app-border-color); + font-size: var(--sidebar-font-size); + font-family: var(--label-font-family); + font-weight: var(--sidebar-font-weight); .title-bar-drag { -webkit-app-region: drag; @@ -149,6 +152,7 @@ .item { &.active { background-color: var(--sidebar-highlight-color); + font-weight: var(--sidebar-highlight-font-weight); } .index { font-size: 10px; diff --git a/src/app/workspace/cmdinput/cmdinput.less b/src/app/workspace/cmdinput/cmdinput.less index a39890610..934500c71 100644 --- a/src/app/workspace/cmdinput/cmdinput.less +++ b/src/app/workspace/cmdinput/cmdinput.less @@ -135,6 +135,7 @@ overflow-wrap: anywhere; border-color: transparent; border: none; + font-family: var(--termfontfamily); line-height: var(--termlineheight); font-size: var(--termfontsize); border-radius: 4px 4px 0 4px; // 0 is for shelltag diff --git a/src/app/workspace/screen/tabs.less b/src/app/workspace/screen/tabs.less index 9ad9ae62d..87c7e4cee 100644 --- a/src/app/workspace/screen/tabs.less +++ b/src/app/workspace/screen/tabs.less @@ -2,7 +2,10 @@ #main .screen-tabs .screen-tab { border-top: 1px solid transparent; - font-size: 12.5px; + font-size: var(--screentabs-font-size); + line-height: var(--screentabs-line-height); + font-family: var(--label-font-family); + font-weight: var(--screentabs-font-weight); &:not(:hover) .status-indicator { .status-indicator-visible; @@ -81,7 +84,8 @@ } } -.screen-tabs-container { +// #main for selectivity +#main .screen-tabs-container { display: flex; position: relative; overflow: hidden; @@ -159,6 +163,7 @@ &.is-active { border-top: none; opacity: 1; + font-weight: var(--screentabs-selected-font-weight); } &.is-archived { diff --git a/src/app/workspace/screen/tabs.tsx b/src/app/workspace/screen/tabs.tsx index 2c027a17d..6287a4403 100644 --- a/src/app/workspace/screen/tabs.tsx +++ b/src/app/workspace/screen/tabs.tsx @@ -185,7 +185,11 @@ class ScreenTabs extends React.Component< let activeScreenId = this.getActiveScreenId(); const sidebarCollapsed = GlobalModel.mainSidebarModel.getCollapsed(); return ( -