Client ID
{cdata.clientid}
diff --git a/src/app/common/elements/button.less b/src/app/common/elements/button.less
index 9d7a825d..d37b0034 100644
--- a/src/app/common/elements/button.less
+++ b/src/app/common/elements/button.less
@@ -18,20 +18,20 @@
background: none;
i {
- fill: var(--button-primary-bg-color);
+ fill: var(--form-element-primary-color);
}
&.solid {
- color: var(--button-primary-color);
- background: var(--button-primary-bg-color);
+ color: var(--form-element-text-color);
+ background: var(--form-element-primary-color);
i {
- fill: var(--button-primary-color);
+ fill: var(--form-element-text-color);
}
}
&.outlined {
- border: 1px solid var(--button-primary-bg-color);
+ border: 1px solid var(--form-element-primary-color);
}
&.ghost {
@@ -39,29 +39,29 @@
}
&:hover {
- color: var(--button-primary-color);
+ color: var(--form-element-text-color);
}
}
&.secondary {
- color: var(--button-text-color);
+ color: var(--form-element-text-color);
background: none;
&.solid {
- color: var(--button-text-color);
- background: var(--button-secondary-bg-color);
+ color: var(--form-element-text-color);
+ background: var(--form-element-secondary-color);
box-shadow: none;
}
&.outlined {
- border: 1px solid var(--button-secondary-bg-color);
+ border: 1px solid var(--form-element-secondary-color);
}
&.ghost {
padding: 6px 10px;
i {
- fill: var(--button-primary-bg-color);
+ fill: var(--form-element-primary-color);
}
}
}
diff --git a/src/app/common/elements/checkbox.less b/src/app/common/elements/checkbox.less
index 25e4cca6..3afbecfb 100644
--- a/src/app/common/elements/checkbox.less
+++ b/src/app/common/elements/checkbox.less
@@ -10,7 +10,7 @@
position: relative;
display: flex;
align-items: center;
- color: var(--checkbox-bg-color);
+ color: var(--form-element-primary-color);
transition: color 250ms cubic-bezier(0.4, 0, 0.23, 1);
}
input[type="checkbox"] + label > span {
@@ -36,7 +36,7 @@
}
input[type="checkbox"]:checked + label > span {
- border: 10px solid var(--button-primary-bg-color);
+ border: 10px solid var(--form-element-primary-color);
}
input[type="checkbox"]:checked + label > span:before {
content: "";
@@ -45,8 +45,8 @@
left: 3px;
width: 7px;
height: 12px;
- border-right: 2px solid var(--checkbox-check-color);
- border-bottom: 2px solid var(--checkbox-check-color);
+ border-right: 2px solid var(--form-element-text-color);
+ border-bottom: 2px solid var(--form-element-text-color);
transform: rotate(45deg);
transform-origin: 0% 100%;
animation: checkbox-check 500ms cubic-bezier(0.4, 0, 0.23, 1);
diff --git a/src/app/common/elements/cmdstrcode.less b/src/app/common/elements/cmdstrcode.less
index f6a54243..50e830eb 100644
--- a/src/app/common/elements/cmdstrcode.less
+++ b/src/app/common/elements/cmdstrcode.less
@@ -36,7 +36,6 @@
}
.code-div {
- background-color: var(--cmdstrcode-bg-color);
display: flex;
flex-direction: row;
min-width: 100px;
@@ -49,7 +48,6 @@
color: var(--cmdstrcode-text-color);
white-space: pre;
padding: 2px 8px 2px 8px;
- background-color: var(--cmdstrcode-bg-color);
font-size: var(--termfontsize);
font-family: var(--termfontfamily);
line-height: var(--termlineheight);
diff --git a/src/app/common/elements/dropdown.less b/src/app/common/elements/dropdown.less
index 681a11a9..70e4bbb2 100644
--- a/src/app/common/elements/dropdown.less
+++ b/src/app/common/elements/dropdown.less
@@ -3,9 +3,9 @@
height: 44px;
min-width: 150px;
width: 100%;
- border: 1px solid var(--dropdown-border-color);
+ border: 2px solid var(--form-element-border-color);
border-radius: 6px;
- background: var(--dropdown-bg-color);
+ background: var(--form-element-bg-color);
&.no-label {
height: 34px;
@@ -17,7 +17,7 @@
top: 16px;
font-size: 12.5px;
transition: all 0.3s;
- color: var(--dropdown-label-color);
+ color: var(--form-element-label-color);
line-height: 10px;
&.float {
@@ -88,11 +88,15 @@
}
&-error {
- border-color: var(--dropdown-error-color);
+ border-color: var(--form-element-error-color);
}
&:focus {
- border-color: var(--dropdown-focus-color);
+ border-color: var(--form-element-primary-color);
+ }
+
+ .lefticon {
+ color: var(--app-text-color);
}
}
@@ -109,13 +113,13 @@
align-items: flex-start;
gap: 4px;
border-radius: 6px;
- border: 1px solid var(--dropdown-border-color);
- background: var(--dropdown-bg-color);
+ border: 2px solid var(--form-element-border-color);
+ background: var(--form-element-bg-color);
// box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.5), 0px 3px 8px 0px rgba(0, 0, 0, 0.35), 0px 0px 0.5px 0px #fff inset,
// 0px 0.5px 0px 0px rgba(255, 255, 255, 0.2) inset;
animation-fill-mode: forwards;
z-index: 1000;
- color: var(--dropdown-text-color);
+ color: var(--form-element-text-color);
}
.wave-dropdown-menu-close {
diff --git a/src/app/common/elements/mainview.less b/src/app/common/elements/mainview.less
index 8433234d..5e9e306c 100644
--- a/src/app/common/elements/mainview.less
+++ b/src/app/common/elements/mainview.less
@@ -25,7 +25,7 @@
padding: 0 10px;
vertical-align: middle;
line-height: var(--screentabs-height);
- color: var(--term-white);
+ color: var(--app-text-color);
margin: 0;
}
diff --git a/src/app/common/elements/textfield.less b/src/app/common/elements/textfield.less
index 66d78624..34386817 100644
--- a/src/app/common/elements/textfield.less
+++ b/src/app/common/elements/textfield.less
@@ -3,10 +3,10 @@
align-items: center;
border-radius: 6px;
position: relative;
- height: 44px;
+ min-height: 44px;
min-width: 412px;
gap: 6px;
- border: 1px solid var(--form-element-border-color);
+ border: 2px solid var(--form-element-border-color);
background: var(--form-element-bg-color);
&:hover {
@@ -27,15 +27,14 @@
&-inner {
display: flex;
- align-items: flex-end;
- height: 100%;
+ flex-direction: column;
position: relative;
flex-grow: 1;
+ --inner-padding: 5px 0 5px 16px;
&-label {
- position: absolute;
- left: 16px;
- top: 16px;
+ padding: var(--inner-padding);
+ margin-bottom: -10px;
font-size: 12.5px;
transition: all 0.3s;
color: var(--form-element-label-color);
@@ -55,7 +54,7 @@
width: 100%;
height: 30px;
border: none;
- padding: 5px 0 5px 16px;
+ padding: var(--inner-padding);
font-size: 16px;
outline: none;
background-color: transparent;
diff --git a/src/app/common/elements/tooltip.less b/src/app/common/elements/tooltip.less
index aafa8092..44ca20d5 100644
--- a/src/app/common/elements/tooltip.less
+++ b/src/app/common/elements/tooltip.less
@@ -15,7 +15,7 @@
i {
display: inline;
font-size: 13px;
- fill: var(--checkbox-text-color);
+ fill: var(--form-element-text-color);
padding-top: 0.2em;
}
}
diff --git a/src/app/common/modals/screensettings.less b/src/app/common/modals/screensettings.less
index 897c48d2..92e78ca4 100644
--- a/src/app/common/modals/screensettings.less
+++ b/src/app/common/modals/screensettings.less
@@ -26,12 +26,16 @@
width: 16px;
height: 16px;
flex-shrink: 0;
+ fill: var(--app-text-secondary-color);
}
.status-icon {
position: absolute;
left: 7px;
top: 8px;
+ circle {
+ stroke: var(--app-bg-color);
+ }
}
}
diff --git a/src/app/common/modals/screensettings.tsx b/src/app/common/modals/screensettings.tsx
index 4d924901..d1813f68 100644
--- a/src/app/common/modals/screensettings.tsx
+++ b/src/app/common/modals/screensettings.tsx
@@ -5,7 +5,7 @@ import * as React from "react";
import * as mobxReact from "mobx-react";
import * as mobx from "mobx";
import { boundMethod } from "autobind-decorator";
-import { If, For } from "tsx-control-statements/components";
+import { For } from "tsx-control-statements/components";
import cn from "classnames";
import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Dropdown, Tooltip } from "@/elements";
@@ -38,15 +38,13 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
shareCopied: OV
= mobx.observable.box(false, { name: "ScreenSettings-shareCopied" });
errorMessage: OV = mobx.observable.box(null, { name: "ScreenSettings-errorMessage" });
screen: Screen;
- sessionId: string;
screenId: string;
remotes: RemoteType[];
constructor(props) {
super(props);
- let screenSettingsModal = GlobalModel.screenSettingsModal.get();
- let { sessionId, screenId } = screenSettingsModal;
- this.sessionId = sessionId;
+ const screenSettingsModal = GlobalModel.screenSettingsModal.get();
+ const { sessionId, screenId } = screenSettingsModal;
this.screenId = screenId;
this.screen = GlobalModel.getScreenById(sessionId, screenId);
if (this.screen == null || sessionId == null || screenId == null) {
@@ -67,8 +65,8 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
value: remote.remotecanonicalname,
}))
.sort((a, b) => {
- let connValA = util.getRemoteConnVal(a);
- let connValB = util.getRemoteConnVal(b);
+ const connValA = util.getRemoteConnVal(a);
+ const connValB = util.getRemoteConnVal(b);
if (connValA !== connValB) {
return connValA - connValB;
}
@@ -92,7 +90,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (this.screen.getTabColor() == color) {
return;
}
- let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { tabcolor: color }, false);
+ const prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { tabcolor: color }, false);
util.commandRtnHandler(prtn, this.errorMessage);
}
@@ -101,7 +99,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (this.screen.getTabIcon() == icon) {
return;
}
- let prtn = GlobalCommandRunner.screenSetSettings(this.screen.screenId, { tabicon: icon }, false);
+ const prtn = GlobalCommandRunner.screenSetSettings(this.screen.screenId, { tabicon: icon }, false);
util.commandRtnHandler(prtn, this.errorMessage);
}
@@ -113,7 +111,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (this.screen.archived.get() == val) {
return;
}
- let prtn = GlobalCommandRunner.screenArchive(this.screenId, val);
+ const prtn = GlobalCommandRunner.screenArchive(this.screenId, val);
util.commandRtnHandler(prtn, this.errorMessage);
}
@@ -125,13 +123,13 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (this.screen.isWebShared() == val) {
return;
}
- let message = val ? WebShareConfirmMarkdown : WebStopShareConfirmMarkdown;
- let alertRtn = GlobalModel.showAlert({ message: message, confirm: true, markdown: true });
+ const message = val ? WebShareConfirmMarkdown : WebStopShareConfirmMarkdown;
+ const alertRtn = GlobalModel.showAlert({ message: message, confirm: true, markdown: true });
alertRtn.then((result) => {
if (!result) {
return;
}
- let prtn = GlobalCommandRunner.screenWebShare(this.screen.screenId, val);
+ const prtn = GlobalCommandRunner.screenWebShare(this.screen.screenId, val);
util.commandRtnHandler(prtn, this.errorMessage);
});
}
@@ -141,7 +139,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (this.screen == null) {
return null;
}
- let shareLink = this.screen.getWebShareUrl();
+ const shareLink = this.screen.getWebShareUrl();
if (shareLink == null) {
return;
}
@@ -164,7 +162,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (util.isStrEq(val, this.screen.name.get())) {
return;
}
- let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { name: val }, false);
+ const prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { name: val }, false);
util.commandRtnHandler(prtn, this.errorMessage);
}
@@ -176,7 +174,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
if (util.isStrEq(val, this.screen.getShareName())) {
return;
}
- let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { sharename: val }, false);
+ const prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { sharename: val }, false);
util.commandRtnHandler(prtn, this.errorMessage);
}
@@ -216,14 +214,14 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
}
render() {
- let screen = this.screen;
+ const screen = this.screen;
if (screen == null) {
return null;
}
let color: string = null;
let icon: string = null;
let index: number = 0;
- let curRemote = GlobalModel.getRemote(GlobalModel.getActiveScreen().getCurRemoteInstance().remoteid);
+ const curRemote = GlobalModel.getRemote(GlobalModel.getActiveScreen().getCurRemoteInstance().remoteid);
return (
diff --git a/src/app/common/prompt/prompt.less b/src/app/common/prompt/prompt.less
index 824a2ac0..5678baaa 100644
--- a/src/app/common/prompt/prompt.less
+++ b/src/app/common/prompt/prompt.less
@@ -12,56 +12,42 @@
}
}
-.term-prompt.term-prompt-color {
+.is-dark .term-prompt.term-prompt-color {
.term-prompt-branch {
color: var(--term-white);
}
- .term-prompt-python {
- color: var(--term-magenta);
- }
-
.term-prompt-remote {
color: var(--term-bright-green);
-
- &.color-green {
- color: var(--term-green);
- }
-
- &.color-red {
- color: var(--term-red);
- }
-
- &.color-blue {
- color: var(--term-bright-blue);
- }
-
- &.color-yellow {
- color: var(--term-bright-yellow);
- }
-
- &.color-magenta {
- color: var(--term-bright-magenta);
- }
-
- &.color-cyan {
- color: var(--termt-bright-cyan);
- }
-
- &.color-white {
- color: var(--term-bright-white);
- }
-
- &.color-orange {
- color: var(--term-orange);
- }
}
.term-prompt-cwd {
color: var(--term-bright-green);
}
-
&.term-prompt-isroot .term-prompt-cwd {
color: var(--term-red);
}
}
+
+.is-light .term-prompt.term-prompt-color {
+ .term-prompt-branch {
+ color: var(--term-black);
+ }
+
+ .term-prompt-remote {
+ color: var(--term-green);
+ }
+
+ .term-prompt-cwd {
+ color: var(--term-green);
+ }
+ &.term-prompt-isroot .term-prompt-cwd {
+ color: var(--term-red);
+ }
+}
+
+.term-prompt.term-prompt-color {
+ .term-prompt-python {
+ color: var(--term-magenta);
+ }
+}
diff --git a/src/app/common/prompt/prompt.tsx b/src/app/common/prompt/prompt.tsx
index 21cef094..04fdb276 100644
--- a/src/app/common/prompt/prompt.tsx
+++ b/src/app/common/prompt/prompt.tsx
@@ -30,9 +30,9 @@ function getRemoteStr(rptr: RemotePtrType): string {
if (rptr == null || isBlank(rptr.remoteid)) {
return "(invalid remote)";
}
- let username = isBlank(rptr.ownerid) ? null : GlobalModel.resolveUserIdToName(rptr.ownerid);
- let remoteRef = GlobalModel.resolveRemoteIdToRef(rptr.remoteid);
- let fullRef = makeFullRemoteRef(username, remoteRef, rptr.name);
+ const username = isBlank(rptr.ownerid) ? null : GlobalModel.resolveUserIdToName(rptr.ownerid);
+ const remoteRef = GlobalModel.resolveRemoteIdToRef(rptr.remoteid);
+ const fullRef = makeFullRemoteRef(username, remoteRef, rptr.name);
return fullRef;
}
@@ -40,11 +40,11 @@ function getShortVEnv(venvDir: string): string {
if (isBlank(venvDir)) {
return "";
}
- let lastSlash = venvDir.lastIndexOf("/");
+ const lastSlash = venvDir.lastIndexOf("/");
if (lastSlash == -1) {
return venvDir;
}
- return venvDir.substr(lastSlash + 1);
+ return venvDir.substring(lastSlash + 1);
}
function replaceHomePath(path: string, homeDir: string): string {
@@ -52,7 +52,7 @@ function replaceHomePath(path: string, homeDir: string): string {
return "~";
}
if (path.startsWith(homeDir + "/")) {
- return "~" + path.substr(homeDir.length);
+ return "~" + path.substring(homeDir.length);
}
return path;
}
@@ -62,7 +62,7 @@ function getCwdStr(remote: RemoteType, state: Record): string {
return "~";
}
let cwd = state.cwd;
- if (remote && remote.remotevars.home) {
+ if (remote?.remotevars.home) {
cwd = replaceHomePath(cwd, remote.remotevars.home);
}
return cwd;
@@ -71,30 +71,29 @@ function getCwdStr(remote: RemoteType, state: Record): string {
@mobxReact.observer
class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record; color: boolean }, {}> {
render() {
- let rptr = this.props.rptr;
+ const rptr = this.props.rptr;
if (rptr == null || isBlank(rptr.remoteid)) {
return ;
}
- let termFontSize = GlobalModel.getTermFontSize();
- let remote = GlobalModel.getRemote(this.props.rptr.remoteid);
- let remoteStr = getRemoteStr(rptr);
- let festate = this.props.festate ?? {};
- let cwd = getCwdStr(remote, festate);
+ const remote = GlobalModel.getRemote(this.props.rptr.remoteid);
+ const remoteStr = getRemoteStr(rptr);
+ const festate = this.props.festate ?? {};
+ const cwd = getCwdStr(remote, festate);
let isRoot = false;
- if (remote && remote.remotevars) {
+ if (remote?.remotevars) {
if (remote.remotevars["sudo"] || remote.remotevars["bestuser"] == "root") {
isRoot = true;
}
}
let remoteColorClass = isRoot ? "color-red" : "color-green";
- if (remote && remote.remoteopts && remote.remoteopts.color) {
+ if (remote?.remoteopts?.color) {
remoteColorClass = "color-" + remote.remoteopts.color;
}
let remoteTitle: string = null;
- if (remote && remote.remotecanonicalname) {
+ if (remote?.remotecanonicalname) {
remoteTitle = "connected to " + remote.remotecanonicalname;
}
- let cwdElem = {cwd};
+ const cwdElem = {cwd};
let remoteElem = null;
if (remoteStr != "local") {
remoteElem = (
@@ -107,7 +106,7 @@ class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record
git:({branchName}){" "}
@@ -115,8 +114,8 @@ class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record
venv:({venv}){" "}
@@ -124,7 +123,7 @@ class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record
conda:({condaEnv}){" "}
diff --git a/src/app/history/history.less b/src/app/history/history.less
index 6c8ed2fd..77cbd566 100644
--- a/src/app/history/history.less
+++ b/src/app/history/history.less
@@ -108,7 +108,7 @@
.search-checkbox {
margin: 0 15px;
padding: 5px 10px 5px 10px;
- background: var(--button-secondary-bg-color);
+ background: var(--form-element-secondary-color);
border-radius: 4px;
display: flex;
flex-direction: row;
@@ -135,9 +135,6 @@
flex-direction: row;
align-items: center;
margin-left: 15px;
-
- .fromts-text {
- }
}
.reset-button {
diff --git a/src/app/line/line.less b/src/app/line/line.less
index d5e24691..9351e034 100644
--- a/src/app/line/line.less
+++ b/src/app/line/line.less
@@ -1,3 +1,5 @@
+@import "@/common/icons/icons.less";
+
.line {
margin: 0;
padding: calc(var(--termpad) * 2) var(--termpad) calc(var(--termpad) * 2 + 1px) calc(var(--termpad) * 3);
@@ -6,6 +8,7 @@
overflow: hidden;
flex-shrink: 0;
position: relative;
+ line-height: 11px;
font-weight: normal;
font-family: var(--termfontfamily);
scroll-margin-bottom: 20px;
@@ -27,9 +30,21 @@
}
}
+ .centered-icon {
+ .positional-icon-visible;
+ height: 15px;
+ width: 15px;
+ .positional-icon-inner {
+ height: 15px;
+ width: 15px;
+ &:first-child {
+ font-size: var(--termfontsize-sm);
+ }
+ }
+ }
+
&.active.selected {
.line-mask {
- background-color: var(--line-selected-bg-color);
border: 2px solid var(--line-active-border-color);
border-left: 4px solid var(--line-active-border-color);
}
@@ -92,35 +107,6 @@
}
}
- .simple-line-status {
- .linenum {
- cursor: pointer;
- }
-
- .avatar {
- display: inline-block;
- height: 1em;
- margin-left: 0.5em;
- vertical-align: text-top;
- fill: var(--primary-background-color);
- }
-
- .success {
- color: var(--primary-accent-color);
- fill: var(--primary-accent-color);
- }
-
- .fail {
- color: var(--line-error-color);
- fill: var(--line-error-color);
- }
-
- .warning {
- color: var(--line-warning-color);
- fill: var(--line-warning-color);
- }
- }
-
&.top-border {
border-top: 1px solid #777;
padding: 10px;
@@ -171,7 +157,7 @@
}
&:hover {
- color: var(--app-icon-hover-color);
+ color: var(--line-actions-active-color);
}
padding: 4px 4px;
@@ -203,7 +189,6 @@
.user {
color: var(--line-meta-user-color);
font-weight: bold;
- margin-top: 1px;
margin-right: 10px;
}
@@ -213,6 +198,31 @@
font-size: var(--termfontsize-sm);
line-height: var(--termlineheight-sm);
color: var(--term-gray);
+ align-items: center;
+
+ .status-icon {
+ display: inline-block;
+ margin-left: 0.5em;
+ height: var(--termfontsize-sm);
+ line-height: 1;
+
+ svg {
+ height: var(--termfontsize-sm);
+ width: var(--termfontsize-sm);
+ vertical-align: baseline;
+ }
+ }
+
+ i.fail {
+ color: var(--line-error-color);
+ fill: var(--line-error-color);
+ }
+
+ i.warning,
+ svg.warning {
+ color: var(--line-warning-color);
+ fill: var(--line-warning-color);
+ }
}
.meta-divider {
@@ -310,7 +320,6 @@
margin: 6px 0 2px 10px;
padding: 2px 5px 0px 5px;
display: inline-block;
- font-size: 10px;
color: var(--term-text-white);
background-color: #151715;
}
diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx
index d2c645f3..56b6893e 100644
--- a/src/app/line/linecomps.tsx
+++ b/src/app/line/linecomps.tsx
@@ -28,6 +28,7 @@ import * as util from "@/util/util";
import * as textmeasure from "@/util/textmeasure";
import "./line.less";
+import { CenteredIcon, RotateIcon } from "../common/icons/icons";
const DebugHeightProblems = false;
const MinLine = 0;
@@ -317,21 +318,19 @@ class SmallLineAvatar extends React.Component<{ line: LineType; cmd: Cmd; onRigh
icon = ;
iconTitle = "error";
} else if (status == "running" || status == "detached") {
- icon = ;
+ icon = ;
iconTitle = "running";
} else {
icon = ;
iconTitle = "unknown";
}
return (
-
-
{lineNumStr}
-
{icon}
-
{lineNumStr}
+
+ {icon}
+
+
);
}
}
diff --git a/src/app/workspace/cmdinput/cmdinput.less b/src/app/workspace/cmdinput/cmdinput.less
index e99f3ad5..540758ef 100644
--- a/src/app/workspace/cmdinput/cmdinput.less
+++ b/src/app/workspace/cmdinput/cmdinput.less
@@ -1,3 +1,5 @@
+@import "@/common/icons/icons.less";
+
.cmd-input {
max-height: max(300px, 40%);
display: flex;
@@ -10,9 +12,6 @@
border-top: 2px solid var(--app-border-color);
background-color: var(--app-bg-color);
- &.active {
- }
-
&.has-info,
&.has-aichat,
&.has-history {
@@ -43,11 +42,18 @@
align-items: center;
.cmdinput-icon {
+ display: inline-flex;
color: var(--app-icon-hover-color);
opacity: 0.5;
- &.running-cmds i {
- color: var(--app-warning-color);
+ .centered-icon {
+ .positional-icon-visible;
+ }
+
+ &.running-cmds {
+ .rotate {
+ fill: var(--app-warning-color);
+ }
}
&.active {
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index 29c81950..6cac9b5a 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -15,7 +15,7 @@ import { TextAreaInput } from "./textareainput";
import { InfoMsg } from "./infomsg";
import { HistoryInfo } from "./historyinfo";
import { Prompt } from "@/common/prompt/prompt";
-import { RotateIcon } from "@/common/icons/icons";
+import { CenteredIcon, RotateIcon } from "@/common/icons/icons";
import { AIChat } from "./aichat";
import "./cmdinput.less";
@@ -155,7 +155,10 @@ class CmdInput extends React.Component<{}, {}> {
title="Filter for Running Commands"
onClick={() => this.toggleFilter(screen)}
>
- {numRunningLines}
+ {numRunningLines}{" "}
+
+
+
diff --git a/src/app/workspace/screen/screenview.less b/src/app/workspace/screen/screenview.less
index c3c1e399..17ade0bd 100644
--- a/src/app/workspace/screen/screenview.less
+++ b/src/app/workspace/screen/screenview.less
@@ -249,12 +249,16 @@
width: 16px;
height: 16px;
flex-shrink: 0;
+ fill: var(--app-text-secondary-color);
}
.status-icon {
position: absolute;
left: 7px;
top: 8px;
+ circle {
+ stroke: var(--app-bg-color);
+ }
}
}
diff --git a/src/plugins/code/code.less b/src/plugins/code/code.less
index 6da14f5d..742bc160 100644
--- a/src/plugins/code/code.less
+++ b/src/plugins/code/code.less
@@ -61,7 +61,7 @@
top: 0.2em;
right: 12rem;
border-radius: 5px;
- background-color: var(--button-secondary-bg-color);
+ background-color: var(--form-element-secondary-color);
color: var(--app-error-color);
z-index: 1;
padding: 0 0.8em;
diff --git a/wavesrv/pkg/cmdrunner/shparse.go b/wavesrv/pkg/cmdrunner/shparse.go
index 2be93626..4544d955 100644
--- a/wavesrv/pkg/cmdrunner/shparse.go
+++ b/wavesrv/pkg/cmdrunner/shparse.go
@@ -258,7 +258,7 @@ func isRtnStateCmd(cmd syntax.Command) bool {
}
arg1 := getCallExprLitArg(callExpr, 1)
if arg0 == "git" {
- if arg1 == "checkout" || arg1 == "switch" {
+ if arg1 == "checkout" || arg1 == "co" || arg1 == "switch" {
return true
}
}