Skip to content

Add improvements to connect form connect message styling #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2020
Merged

Add improvements to connect form connect message styling #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/views/webview-app/components/connect-form/form-actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,14 @@ class FormActions extends React.Component<props> {
renderConnect = (): React.ReactNode => {
const syntaxError = this.hasSyntaxError() ? 'disabled' : '';

const { isConnecting } = this.props;

let connectingText = 'Connect';
if (isConnecting) {
connectingText = 'Connecting...';
}

return (
<button
type="submit"
name="connect"
className={classnames(styles.btn, syntaxError)}
onClick={this.onConnectClicked}
>
{connectingText}
Connect
</button>
);
};
Expand All @@ -91,12 +84,15 @@ class FormActions extends React.Component<props> {
let colorStyle = styles['connection-message-container-success'];
let hasMessage = false;

if (this.hasError()) {
if (this.props.isConnected) {
hasMessage = true;
} else if (this.props.isConnecting) {
hasMessage = true;
message = 'Connecting...';
} else if (this.hasError()) {
hasMessage = true;
message = this.props.errorMessage;
colorStyle = styles['connection-message-container-error'];
} else if (this.props.isConnected) {
hasMessage = true;
}

if (hasMessage === true) {
Expand Down
32 changes: 9 additions & 23 deletions src/views/webview-app/connect.module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@pw: #21313c;
@alertRed: #cf4a22;
@warningText: #ffdd49;
@green: #13aa52;
@green: rgb(19, 170, 82);
@gray: #5d6c74;

.page {
Expand Down Expand Up @@ -35,7 +35,7 @@ label {

.connect {
&-is-connected {
border: 2px solid green;
border: 2px solid @green;
}

::-webkit-scrollbar {
Expand Down Expand Up @@ -93,6 +93,7 @@ label {
}

&-success {
color: white;
background: @green;
padding: 4px 10px;
border-radius: 3px;
Expand All @@ -117,24 +118,6 @@ label {
}
}

.success {
background-color: #90ee90;
border-bottom: 3px solid #008000;
position: absolute;
top: 0;
left: 0;
height: 72px;
width: 100%;

p {
margin: 26px auto;
width: 70%;
color: #008000;
text-align: center;
font-weight: bold;
}
}

.connect-form {
margin: 10px;
width: 320px;
Expand All @@ -156,8 +139,10 @@ label {

div {
border: none;
background-color: var(--vscode-searchEditor-textInputBorder,
rgba(161, 161, 161, 0.5));
background-color: var(
--vscode-searchEditor-textInputBorder,
rgba(161, 161, 161, 0.5)
);
}
}

Expand Down Expand Up @@ -201,7 +186,8 @@ label {
&-file-button {
width: 100%;
background: var(--vscode-input-background, transparent);
border: 1px solid var(--vscode-searchEditor-textInputBorder, rgba(161, 161, 161, 0.5));
border: 1px solid
var(--vscode-searchEditor-textInputBorder, rgba(161, 161, 161, 0.5));
border-radius: 3px;
color: var(--vscode-editor-foreground);
padding: 8px 4px 9px;
Expand Down