diff --git a/orion-ops-ui/src/views/host-ops/terminal/assets/styles/layout.less b/orion-ops-ui/src/views/host-ops/terminal/assets/styles/layout.less index 1be69d0d..238b08e8 100644 --- a/orion-ops-ui/src/views/host-ops/terminal/assets/styles/layout.less +++ b/orion-ops-ui/src/views/host-ops/terminal/assets/styles/layout.less @@ -1,3 +1,25 @@ +// 亮色主题配色常量 +body[terminal-theme='light'] { + --color-bg-header: #232323; + --color-bg-sidebar: #F2F3F5; + --color-bg-content: #FEFEFE; + --color-sidebar-icon: #737070; + --color-sidebar-icon-bg: #D7D8DB; + --color-sidebar-tooltip-text: rgba(255, 255, 255, .9); + --color-sidebar-tooltip-bg: rgb(29, 33, 41); +} + +// 暗色主题配色常量 +body[terminal-theme='dark'] { + --color-bg-header: #232323; + --color-bg-sidebar: #2C2E31; + --color-bg-content: #1A1B1F; + --color-sidebar-icon: #C3C8CE; + --color-sidebar-icon-bg: #43444C; + --color-sidebar-tooltip-text: rgba(255, 255, 255, .9); + --color-sidebar-tooltip-bg: var(--color-sidebar-icon-bg); +} + // 布局常量 .host-layout { --header-height: 44px; @@ -5,42 +27,17 @@ --sidebar-icon-wrapper-size: var(--header-height); --sidebar-icon-size: 32px; --sidebar-icon-font-size: 22px; -} -// 亮色主题配色常量 -body[terminal-theme='light'] { - --color-bg-header: #292B31; - --color-bg-sidebar: #F2F3F5; - --color-bg-content: #FEFEFE; - --color-sidebar-icon: #737070; - --color-sidebar-icon-bg: #D7D8DB; - --color-text-white: rgba(255, 255, 255, .9); - --color-text-black: rgba(0, 0, 0, .9); - --color-sidebar-tooltip-text: var(--color-text-white); - --color-sidebar-tooltip-bg: rgb(var(--gray-10)); - --color-host-tabs-bg: var(--color-bg-header); - --color-host-tabs-active-bg: var(--color-bg-content); - --color-host-tabs-text: rgba(255, 255, 255, .6); - --color-host-tabs-hover-text: rgba(255, 255, 255, .8); - --color-host-tabs-active-text: var(--color-text-black); -} - -// 暗色主题配色常量 -body[terminal-theme='dark'] { - --color-bg-header: #2C2E31; - --color-bg-sidebar: #2C2E31; - --color-bg-content: #1A1B1F; - --color-sidebar-icon: #C3C8CE; - --color-sidebar-icon-bg: #43444C; - --color-text-white: rgba(255, 255, 255, .9); - --color-text-black: rgba(0, 0, 0, .9); - --color-sidebar-tooltip-text: var(--color-text-white); - --color-sidebar-tooltip-bg: var(--color-sidebar-icon-bg); - --color-host-tabs-bg: var(--color-bg-header); - --color-host-tabs-active-bg: var(--color-bg-content); - --color-host-tabs-text: rgba(255, 255, 255, .6); - --color-host-tabs-hover-text: rgba(255, 255, 255, .8); - --color-host-tabs-active-text: rgba(255, 255, 255, .9); + --color-bg-header-icon-1: #434343; + --color-header-tabs-sp: #4B4B4B; + --color-header-tabs-bg: var(--color-bg-header); + --color-header-tabs-bg-hover: #434343; + --color-header-text-1: rgba(255, 255, 255, .9); + --color-header-text-2: rgba(255, 255, 255, .75); + --color-gradient-start: rgba(46, 46, 46, 1); + --color-gradient-end: rgba(46, 46, 46, 0); + --color-gradient-hover-start: rgba(88, 88, 88, 1); + --color-gradient-hover-end: rgba(88, 88, 88, 0); } // 侧栏图标 wrapper @@ -71,128 +68,13 @@ body[terminal-theme='dark'] { } } -// 侧栏 tooltip 内容 -.terminal-sidebar-tooltip-content { +// tooltip 内容 +.terminal-tooltip-content { color: var(--color-sidebar-tooltip-text); background: var(--color-sidebar-tooltip-bg); } -// 侧栏 tooltip 箭头 -.terminal-sidebar-tooltip-arrow { +// tooltip 箭头 +.terminal-tooltip-arrow { display: none; } - -.host-layout.light { - --color-white: #FFFFFF; - --color-black: #000000; - --color-border: rgb(var(--gray-3)); - --color-bg-popup: var(--color-bg-5); - --color-bg-1: #FFFFFF; - --color-bg-2: #FFFFFF; - --color-bg-3: #FFFFFF; - --color-bg-4: #FFFFFF; - --color-bg-5: #FFFFFF; - --color-bg-white: #FFFFFF; - --color-neutral-1: rgb(var(--gray-1)); - --color-neutral-2: rgb(var(--gray-2)); - --color-neutral-3: rgb(var(--gray-3)); - --color-neutral-4: rgb(var(--gray-4)); - --color-neutral-5: rgb(var(--gray-5)); - --color-neutral-6: rgb(var(--gray-6)); - --color-neutral-7: rgb(var(--gray-7)); - --color-neutral-8: rgb(var(--gray-8)); - --color-neutral-9: rgb(var(--gray-9)); - --color-neutral-10: rgb(var(--gray-10)); - --color-text-1: var(--color-neutral-10); - --color-text-2: var(--color-neutral-8); - --color-text-3: var(--color-neutral-6); - --color-text-4: var(--color-neutral-4); - --color-border-1: var(--color-neutral-2); - --color-border-2: var(--color-neutral-3); - --color-border-3: var(--color-neutral-4); - --color-border-4: var(--color-neutral-6); - --color-fill-1: var(--color-neutral-1); - --color-fill-2: var(--color-neutral-2); - --color-fill-3: var(--color-neutral-3); - --color-fill-4: var(--color-neutral-4); - --color-primary-light-1: rgb(var(--primary-1)); - --color-primary-light-2: rgb(var(--primary-2)); - --color-primary-light-3: rgb(var(--primary-3)); - --color-primary-light-4: rgb(var(--primary-4)); - --color-link-light-1: rgb(var(--link-1)); - --color-link-light-2: rgb(var(--link-2)); - --color-link-light-3: rgb(var(--link-3)); - --color-link-light-4: rgb(var(--link-4)); - --color-secondary: var(--color-neutral-2); - --color-secondary-hover: var(--color-neutral-3); - --color-secondary-active: var(--color-neutral-4); - --color-secondary-disabled: var(--color-neutral-1); - --color-danger-light-1: rgb(var(--danger-1)); - --color-danger-light-2: rgb(var(--danger-2)); - --color-danger-light-3: rgb(var(--danger-3)); - --color-danger-light-4: rgb(var(--danger-4)); - --color-success-light-1: rgb(var(--success-1)); - --color-success-light-2: rgb(var(--success-2)); - --color-success-light-3: rgb(var(--success-3)); - --color-success-light-4: rgb(var(--success-4)); - --color-warning-light-1: rgb(var(--warning-1)); - --color-warning-light-2: rgb(var(--warning-2)); - --color-warning-light-3: rgb(var(--warning-3)); - --color-warning-light-4: rgb(var(--warning-4)); - --color-sidebar-tooltip-bg: rgb(var(--gray-10)); - --color-spin-layer-bg: rgba(255, 255, 255, 0.6); - --color-menu-dark-bg: #232324; - --color-menu-light-bg: #FFFFFF; - --color-menu-dark-hover: rgba(255, 255, 255, 0.04); - --color-mask-bg: rgba(29, 33, 41, 0.6); -} - -.host-layout.dark { - --color-white: rgba(255, 255, 255, 0.9); - --color-black: #000000; - --color-border: #333335; - --color-bg-1: #17171A; - --color-bg-2: #232324; - --color-bg-3: #2A2A2B; - --color-bg-4: #313132; - --color-bg-5: #373739; - --color-bg-white: #F6F6F6; - --color-text-1: rgba(255, 255, 255, 0.9); - --color-text-2: rgba(255, 255, 255, 0.7); - --color-text-3: rgba(255, 255, 255, 0.5); - --color-text-4: rgba(255, 255, 255, 0.3); - --color-fill-1: rgba(255, 255, 255, 0.04); - --color-fill-2: rgba(255, 255, 255, 0.08); - --color-fill-3: rgba(255, 255, 255, 0.12); - --color-fill-4: rgba(255, 255, 255, 0.16); - --color-primary-light-1: rgba(var(--primary-6), 0.2); - --color-primary-light-2: rgba(var(--primary-6), 0.35); - --color-primary-light-3: rgba(var(--primary-6), 0.5); - --color-primary-light-4: rgba(var(--primary-6), 0.65); - --color-secondary: rgba(var(--gray-9), 0.08); - --color-secondary-hover: rgba(var(--gray-8), 0.16); - --color-secondary-active: rgba(var(--gray-7), 0.24); - --color-secondary-disabled: rgba(var(--gray-9), 0.08); - --color-danger-light-1: rgba(var(--danger-6), 0.2); - --color-danger-light-2: rgba(var(--danger-6), 0.35); - --color-danger-light-3: rgba(var(--danger-6), 0.5); - --color-danger-light-4: rgba(var(--danger-6), 0.65); - --color-success-light-1: rgb(var(--success-6), 0.2); - --color-success-light-2: rgb(var(--success-6), 0.35); - --color-success-light-3: rgb(var(--success-6), 0.5); - --color-success-light-4: rgb(var(--success-6), 0.65); - --color-warning-light-1: rgb(var(--warning-6), 0.2); - --color-warning-light-2: rgb(var(--warning-6), 0.35); - --color-warning-light-3: rgb(var(--warning-6), 0.5); - --color-warning-light-4: rgb(var(--warning-6), 0.65); - --color-link-light-1: rgb(var(--link-6), 0.2); - --color-link-light-2: rgb(var(--link-6), 0.35); - --color-link-light-3: rgb(var(--link-6), 0.5); - --color-link-light-4: rgb(var(--link-6), 0.65); - --color-sidebar-tooltip-bg: #373739; - --color-spin-layer-bg: rgba(51, 51, 51, 0.6); - --color-menu-dark-bg: #232324; - --color-menu-light-bg: #232324; - --color-menu-dark-hover: var(--color-fill-2); - --color-mask-bg: rgba(23, 23, 26, 0.6); -} diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue new file mode 100644 index 00000000..349aea54 --- /dev/null +++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/icon-actions.vue @@ -0,0 +1,43 @@ + + + + + + + diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue index 35ccd7b5..202c0ecf 100644 --- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue +++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-header.vue @@ -9,20 +9,23 @@ -
+
+ + + + {{ i }} + + - -
-
- - -
-
-
+
@@ -34,21 +37,47 @@ diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue index dcbdc790..715d60d0 100644 --- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue +++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-left-sidebar.vue @@ -1,19 +1,13 @@ @@ -25,21 +19,41 @@ @@ -47,5 +61,8 @@ diff --git a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue index 10abb4b6..734f6ae2 100644 --- a/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue +++ b/orion-ops-ui/src/views/host-ops/terminal/components/layout/terminal-right-sidebar.vue @@ -1,19 +1,9 @@ @@ -25,6 +15,7 @@