Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge main

Browse Source
This commit is contained in:
Red Adaya 2024-11-14 10:16:36 +08:00
commit c494c9e4fe
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/app/block/block.less
View File

@ -61,7 +61,7 @@
} }
&.block-preview.block-frame-default .block-frame-default-inner .block-frame-default-header { &.block-preview.block-frame-default .block-frame-default-inner .block-frame-default-header {
background-color: var(--block-header-bg-color); background-color: rgb(from var(--block-bg-color) r g b / 70%);
} }
&.block-frame-default { &.block-frame-default {
@ -254,7 +254,7 @@
} }
.block-frame-preview { .block-frame-preview {
background-color: var(--block-header-bg-color); background-color: rgb(from var(--block-bg-color) r g b / 70%);
width: 100%; width: 100%;
flex-grow: 1; flex-grow: 1;
border-bottom-left-radius: var(--block-border-radius); border-bottom-left-radius: var(--block-border-radius);
@ -271,6 +271,12 @@
} }
} }
&.magnified,
&.ephemeral {
background-color: rgb(from var(--block-bg-color) r g b / 60%);
backdrop-filter: blur(10px);
}
.connstatus-overlay { .connstatus-overlay {
position: absolute; position: absolute;
top: calc(var(--header-height) + 6px); top: calc(var(--header-height) + 6px);
@ -285,7 +291,7 @@
background: var(--conn-status-overlay-bg-color); background: var(--conn-status-overlay-bg-color);
backdrop-filter: blur(50px); backdrop-filter: blur(50px);
border-radius: 6px; border-radius: 6px;
box-shadow: 0px 13px 16px 0px var(--conn-status-overlay-box-shadow-color); box-shadow: 0px 13px 16px 0px rgb(from var(--block-bg-color) r g b / 40%);
.connstatus-content { .connstatus-content {
display: flex; display: flex;
@ -385,7 +391,7 @@
&.show-block-mask .block-mask-inner { &.show-block-mask .block-mask-inner {
margin-top: var(--header-height); // TODO fix this magic margin-top: var(--header-height); // TODO fix this magic
background-color: var(--block-bg-color); background-color: rgb(from var(--block-bg-color) r g b / 50%);
height: calc(100% - var(--header-height)); height: calc(100% - var(--header-height));
width: 100%; width: 100%;
display: flex; display: flex;
@ -409,7 +415,7 @@
&.block-no-highlight, &.block-no-highlight,
&.block-preview { &.block-preview {
.block-mask { .block-mask {
border: 2px solid var(--block-preview-border-color) !important; border: 2px solid rgb(from var(--border-color) r g b / 1%) !important;
} }
} }
} }

14
frontend/app/theme.less
View File

@ -26,7 +26,6 @@
--block-header-bg-color: rgba(0, 0, 0, 0.7); --block-header-bg-color: rgba(0, 0, 0, 0.7);
--block-bg-solid-color: rgb(0, 0, 0); --block-bg-solid-color: rgb(0, 0, 0);
--block-border-radius: 8px; --block-border-radius: 8px;
--block-preview-border-color: rgba(255, 255, 255, 0.1);
--keybinding-color: #e0e0e0; --keybinding-color: #e0e0e0;
--keybinding-bg-color: #333; --keybinding-bg-color: #333;
@ -58,10 +57,14 @@
--zindex-tab-name: 3; --zindex-tab-name: 3;
--zindex-layout-display-container: 0; --zindex-layout-display-container: 0;
--zindex-layout-last-magnified-node: 1; --zindex-layout-last-magnified-node: 1;
--zindex-layout-resize-handle: 2; --zindex-layout-last-ephemeral-node: 2;
--zindex-layout-placeholder-container: 3; --zindex-layout-resize-handle: 3;
--zindex-layout-overlay-container: 4; --zindex-layout-placeholder-container: 4;
--zindex-layout-magnified-node: 5; --zindex-layout-overlay-container: 5;
--zindex-layout-magnified-node-backdrop: 6;
--zindex-layout-magnified-node: 7;
--zindex-layout-ephemeral-node-backdrop: 8;
--zindex-layout-ephemeral-node: 9;
--zindex-block-mask-inner: 10; --zindex-block-mask-inner: 10;
--zindex-flash-error-container: 550; --zindex-flash-error-container: 550;
--zindex-app-background: -1; --zindex-app-background: -1;
@ -108,7 +111,6 @@
--conn-icon-color-7: #dbde52; --conn-icon-color-7: #dbde52;
--conn-icon-color-8: #58c142; --conn-icon-color-8: #58c142;
--conn-status-overlay-bg-color: rgba(230, 186, 30, 0.2); --conn-status-overlay-bg-color: rgba(230, 186, 30, 0.2);
--conn-status-overlay-box-shadow-color: rgba(0, 0, 0, 0.4);
--sysinfo-cpu-color: #58c142; --sysinfo-cpu-color: #58c142;
--sysinfo-mem-color: #53b4ea; --sysinfo-mem-color: #53b4ea;