Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

update color tab names (#49)

Browse Source 
* change color names and values

* migrations

* update tab colors in fe

* set to default instead of null

* minor server fixes
This commit is contained in:
Red J Adaya 2023-10-29 04:14:20 +08:00 committed by GitHub
parent 9804dcb14c
commit e0cd8516b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/common/modals/modals.less
View File

@ -341,8 +341,11 @@
.tab-color-icon.color-white path { .tab-color-icon.color-white path {
fill: @tab-white; fill: @tab-white;
} }
.tab-color-icon.color-black path { .tab-color-icon.color-violet path {
fill: @tab-black; fill: @tab-violet;
}
.tab-color-icon.color-pink path {
fill: @tab-pink;
} }
.tab-colors { .tab-colors {

19
src/app/common/themes/themes.less
View File

@ -35,15 +35,16 @@
@term-bright-cyan: #34e2e2; @term-bright-cyan: #34e2e2;
@term-bright-white: #ffffff; @term-bright-white: #ffffff;
@tab-black: rgb(50, 50, 50); @tab-red: #e54d2e;
@tab-red: rgb(205, 49, 49); @tab-green: #58c142;
@tab-green: rgb(0, 128, 0); @tab-orange: #ef713b;
@tab-orange: rgb(255, 199, 6); @tab-violet: #8b46d0;
@tab-yellow: rgb(229, 229, 16); @tab-cyan: #3abab6;
@tab-blue: rgb(0, 71, 171); @tab-magenta: #fc3651;
@tab-magenta: rgb(188, 63, 188); @tab-pink: #e05677;
@tab-cyan: rgb(17, 168, 205); @tab-blue: #5460cf;
@tab-white: rgb(249, 249, 249); @tab-yellow: #e0b956;
@tab-white: #ffffff;
@tab-black-text: #333; @tab-black-text: #333;
@tab-white-text: #d7d7d7; @tab-white-text: #d7d7d7;

10
src/app/workspace/screen/tabs.less
View File

@ -59,9 +59,15 @@
} }
} }
&.color-black { &.color-violet {
svg.left-icon path { svg.left-icon path {
fill: @tab-black; fill: @tab-violet;
}
}
&.color-pink {
svg.left-icon path {
fill: @tab-pink;
} }
} }

2
src/model/model.ts
View File

@ -93,7 +93,7 @@ const MinFontSize = 8;
const MaxFontSize = 15; const MaxFontSize = 15;
const InputChunkSize = 500; const InputChunkSize = 500;
const RemoteColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"]; const RemoteColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"];
const TabColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange", "black"]; const TabColors = ["yellow", "blue", "pink", "magenta", "cyan", "violet", "orange", "green", "red", "white"];
// @ts-ignore // @ts-ignore
const VERSION = __PROMPT_VERSION__; const VERSION = __PROMPT_VERSION__;

1
wavesrv/db/migrations/000024_updatetabcolornames.down.sql Normal file
View File

@ -0,0 +1 @@
-- no down migration

3
wavesrv/db/migrations/000024_updatetabcolornames.up.sql Normal file
View File

@ -0,0 +1,3 @@
UPDATE screen
SET screenopts = json_set(screenopts, '$.tabcolor', 'default')
WHERE json_extract(screenopts, '$.tabcolor') = 'black';

2
wavesrv/pkg/cmdrunner/cmdrunner.go
View File

@ -71,7 +71,7 @@ const (
KwArgLang = "lang" KwArgLang = "lang"
) )
var ColorNames = []string{"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"} var ColorNames = []string{"yellow", "blue", "pink", "magenta", "cyan", "violet", "orange", "green", "red", "white"}
var RemoteColorNames = []string{"red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"} var RemoteColorNames = []string{"red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"}
var RemoteSetArgs = []string{"alias", "connectmode", "key", "password", "autoinstall", "color"} var RemoteSetArgs = []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}

2
wavesrv/pkg/sstore/migrate.go
View File

@ -20,7 +20,7 @@ import (
"github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4"
) )
const MaxMigration = 23 const MaxMigration = 24
const MigratePrimaryScreenVersion = 9 const MigratePrimaryScreenVersion = 9
const CmdScreenSpecialMigration = 13 const CmdScreenSpecialMigration = 13
const CmdLineSpecialMigration = 20 const CmdLineSpecialMigration = 20