Browse Source

fixed #8133 - added active tab indicator, updated default color scheme

Eugene Pankov 2 years ago
parent
commit
73fae43027

+ 1 - 0
tabby-core/src/components/tabHeader.component.pug

@@ -1,6 +1,7 @@
 .colorbar([style.background-color]='tab.color', *ngIf='tab.color != null')
 .progressbar([style.width]='progress + "%"', *ngIf='progress != null')
 .activity-indicator(*ngIf='tab.activity$|async')
+.current-tab-indicator
 
 .index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform === Platform.macOS', cdkDragHandle) {{index + 1}}
 .index(*ngIf='!config.store.terminal.hideTabIndex && hostApp.platform !== Platform.macOS') {{index + 1}}

+ 17 - 3
tabby-core/src/components/tabHeader.component.scss

@@ -134,15 +134,29 @@ $tabs-height: 38px;
         z-index: 1;
     }
 
+    .activity-indicator, .current-tab-indicator {
+        position: absolute;
+        height: 2px;
+    }
+
     &.active .activity-indicator {
         display: none;
     }
 
     .activity-indicator {
-        position: absolute;
+        bottom: 4px;
         left: 10px;
         right: 10px;
-        bottom: 4px;
-        height: 2px;
+    }
+
+    &.active .current-tab-indicator {
+        display: block;
+    }
+
+    .current-tab-indicator {
+        display: none;
+        top: 0;
+        left: 0;
+        right: 0;
     }
 }

+ 6 - 1
tabby-core/src/theme.new.scss

@@ -30,6 +30,7 @@ app-root {
                     border-left: 1px solid transparent;
                     border-right: 1px solid transparent;
                     transition: 0.125s ease-out width;
+                    color: var(--theme-fg-more-2);
 
                     .index {
                         color: var(--bs-body-color);
@@ -54,8 +55,12 @@ app-root {
                         opacity: .2;
                     }
 
+                    .current-tab-indicator {
+                        background:var(--bs-light);
+                    }
+
                     &.active {
-                        color: var(--theme-fg-less-2);
+                        color: var(--theme-fg);
                         background: var(--body-bg);
                     }
                 }

+ 14 - 14
tabby-terminal/src/config.ts

@@ -38,20 +38,20 @@ export class TerminalConfigProvider extends ConfigProvider {
                 cursor: '#bbbbbb',
                 colors: [
                     '#000000',
-                    '#ee2b2a',
-                    '#40a33f',
-                    '#ffea2e',
-                    '#1e80f0',
-                    '#8800a0',
-                    '#16afca',
-                    '#84949c',
-                    '#3d4b4f',
-                    '#dc5c60',
-                    '#70be71',
-                    '#fff163',
-                    '#54a4f3',
-                    '#aa4dbc',
-                    '#42c7da',
+                    '#ff615a',
+                    '#b1e969',
+                    '#ebd99c',
+                    '#5da9f6',
+                    '#e86aff',
+                    '#82fff7',
+                    '#dedacf',
+                    '#313131',
+                    '#f58c80',
+                    '#ddf88f',
+                    '#eee5b2',
+                    '#a5c7ff',
+                    '#ddaaff',
+                    '#b7fff9',
                     '#ffffff',
                 ],
                 selection: null,