Skip to content
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.

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

style: update webview green based on vscode theme type VSCODE-297 #363

Merged
merged 1 commit into from
Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions src/views/webview-app/components/app.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import "~../styles/_variables";

:root {
// NOTE: This green is updated in the code dynamically
// and updates on the current color theme of vscode (light vs dark).
--mongodb-green: @green;
}

a {
color: var(--mongodb-green);
}

a:hover {
color: var(--mongodb-green);
}

*:focus {
outline-color: @green-selected;
}

a:focus {
outline-color: @green-selected;
}
19 changes: 19 additions & 0 deletions src/views/webview-app/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import {

const styles = require('../connect.module.less');

import './app.less';

type DispatchProps = {
onConnectedEvent: (
connectionAttemptId: string,
Expand All @@ -34,6 +36,23 @@ type DispatchProps = {
};

export class App extends React.Component<DispatchProps> {
constructor(props) {
super(props);

// Update the MongoDB green color we used based on the current
// theme kind of the VSCode user.
const element = document.querySelector('body');
if (element?.getAttribute('data-vscode-theme-kind') === 'vscode-light') {
document.documentElement.style.setProperty(
'--mongodb-green', '#00684A' // Forest green
);
} else {
document.documentElement.style.setProperty(
'--mongodb-green', '#00ED64' // Base green
);
}
}

componentDidMount(): void {
window.addEventListener('message', (event) => {
const message: MESSAGE_FROM_EXTENSION_TO_WEBVIEW = event.data;
Expand Down
4 changes: 0 additions & 4 deletions src/views/webview-app/components/atlas-cta/atlas-cta.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
margin: 0 32px;
}

.atlas-cta-text-link {
color: @green;
}

.atlas-cta-logo {
display: inline-block;
margin-left: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
margin-bottom: -1px;
pointer-events: none;
outline: none;
background-color: @green;
background-color: var(--mongodb-green);
border-top-left-radius: 3px;
border-top-right-radius: 3px;
animation-name: selectedConnectionTabAnimation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.connection-status-dot-connected:before {
background-color: @green;
background-color: var(--mongodb-green);
}

.connection-status-dot-disconnected:before {
Expand All @@ -47,19 +47,24 @@

.connection-status-create-playground-button {
display: inline-block;
border: none;
border: 1px solid rgb(21, 130, 66);
border-radius: 3px;
margin: 0 20px;
margin-top: 20px;
height: 32px;
width: 161px;
transition: 150ms all;
color: white;
background-color: #13aa52;
transition: 250ms all;
background-color: var(--mongodb-green);
background-image: linear-gradient(rgb(19, 170, 82), rgb(24, 150, 76));
box-shadow: rgb(21, 130, 66) 0px -1px 0px inset;

&:hover {
cursor: pointer;
background-color: #3F864B;
color: white;
background-color: #109648;
background-image: linear-gradient(#129f4c, #148040);
border-color: rgb(21, 130, 66);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/views/webview-app/components/form/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
}

.btn {
background-color: @green;
background-color: var(--mongodb-green);;
padding: 9px 28px 10px;
margin: 6px 0 0 0;
display: inline-block;
Expand Down Expand Up @@ -142,8 +142,8 @@

.btn-primary {
color: white;
background-color: @green;
background-image: linear-gradient(@green, rgb(24, 150, 76));
background-color: var(--mongodb-green);
background-image: linear-gradient(rgb(19, 170, 82), rgb(24, 150, 76));

border-color: rgb(21, 130, 66);
box-shadow: rgb(21, 130, 66) 0px -1px 0px inset;
Expand Down Expand Up @@ -190,7 +190,7 @@

&-success {
color: white;
background: @green;
background: var(--mongodb-green);
padding: 4px 10px;
border-radius: 3px;
}
Expand Down
10 changes: 9 additions & 1 deletion src/views/webview-app/components/mongodb-logo/mongodb-logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,18 @@ const styles = require('./mongodb-logo.less');

class MongoDBLogo extends React.PureComponent {
render(): React.ReactNode {
let darkMode = true;
// Update the MongoDB green color we used based on the current
// theme kind of the VSCode user.
const element = document.querySelector('body');
if (element?.getAttribute('data-vscode-theme-kind') === 'vscode-light') {
darkMode = false;
}

return (
<LeafyGreenMongoDBLogo
className={styles['mdb-logo-svg']}
color={'green-base'}
color={darkMode ? 'green-base' : 'green-dark-2'}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

.resources-panel-header {
font-size: 21px;
color: @green;
color: var(--mongodb-green);
text-align: left;
}

Expand Down
28 changes: 8 additions & 20 deletions src/views/webview-app/connect.module.less
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
@import "~./styles/_variables";

a:hover {
color: @green;
}

*:focus {
outline-color: @green-selected;
}

a:focus {
outline-color: @green-selected;
}

.page {
display: flex;
flex-direction: row;
Expand All @@ -35,13 +23,6 @@ a:focus {
}
}

label {
display: inline-block;
max-width: 100%;
margin-bottom: 5px;
font-weight: bold;
}

.connect-form-help-panel {
margin: 30px;
display: inline-block;
Expand All @@ -51,8 +32,15 @@ label {
.connect {
min-width: 700px;

label {
display: inline-block;
max-width: 100%;
margin-bottom: 5px;
font-weight: bold;
}

&-is-connected {
border: 2px solid @green;
border: 2px solid var(--mongodb-green);
}

::-webkit-scrollbar {
Expand Down