From bde24a8b6854561f3fb4735edc502adcd81cc193 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Fri, 19 Mar 2021 23:41:12 +0000
Subject: [PATCH 01/14] Rstore button padding
---
components/dashboard/src/index.css | 2 +-
components/dashboard/src/tailwind.output.css | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/dashboard/src/index.css b/components/dashboard/src/index.css
index b8fb28ad2a64c2..a27a6542980f89 100644
--- a/components/dashboard/src/index.css
+++ b/components/dashboard/src/index.css
@@ -29,7 +29,7 @@
@layer components {
button {
- @apply cursor-pointer px-3 py-1 my-auto bg-green-600 hover:bg-green-700 border-2 border-green-800 text-gray-100 text-sm rounded-md;
+ @apply cursor-pointer px-4 py-2 my-auto bg-green-600 hover:bg-green-700 border-2 border-green-800 text-gray-100 text-sm rounded-md;
}
input[type=text] {
diff --git a/components/dashboard/src/tailwind.output.css b/components/dashboard/src/tailwind.output.css
index 95f55d4870ebed..49fff65478047c 100644
--- a/components/dashboard/src/tailwind.output.css
+++ b/components/dashboard/src/tailwind.output.css
@@ -869,10 +869,10 @@ button {
line-height: 1.25rem;
margin-top: auto;
margin-bottom: auto;
- padding-top: 0.25rem;
- padding-bottom: 0.25rem;
- padding-left: 0.75rem;
- padding-right: 0.75rem;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+ padding-left: 1rem;
+ padding-right: 1rem;
--tw-text-opacity: 1;
color: rgba(245, 245, 244, var(--tw-text-opacity));
}
From 9f458a9b6f9cef0f8f44bd38b54ef63128ab8d47 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Fri, 19 Mar 2021 23:59:14 +0000
Subject: [PATCH 02/14] Remove primary button from modal lists
---
components/dashboard/src/index.css | 2 +-
.../dashboard/src/start/CreateWorkspace.tsx | 5 +---
components/dashboard/src/tailwind.output.css | 25 +++++++++++++++++++
.../dashboard/src/workspaces/Workspaces.tsx | 10 +++-----
4 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/components/dashboard/src/index.css b/components/dashboard/src/index.css
index a27a6542980f89..acbd24bb774316 100644
--- a/components/dashboard/src/index.css
+++ b/components/dashboard/src/index.css
@@ -29,7 +29,7 @@
@layer components {
button {
- @apply cursor-pointer px-4 py-2 my-auto bg-green-600 hover:bg-green-700 border-2 border-green-800 text-gray-100 text-sm rounded-md;
+ @apply cursor-pointer px-4 py-2 my-auto bg-green-600 hover:bg-green-700 border-2 border-green-800 text-gray-100 text-sm rounded-md focus:outline-none focus:ring focus:border-blue-300;
}
input[type=text] {
diff --git a/components/dashboard/src/start/CreateWorkspace.tsx b/components/dashboard/src/start/CreateWorkspace.tsx
index 8cc39e700a0406..74f6557d93b81a 100644
--- a/components/dashboard/src/start/CreateWorkspace.tsx
+++ b/components/dashboard/src/start/CreateWorkspace.tsx
@@ -111,14 +111,11 @@ export class CreateWorkspace extends React.Component{w.workspace.id}
{w.workspace.contextURL}
-
- Open
-
)}
>
-
+
this.createWorkspace(CreateWorkspaceMode.Default)}>New Workspace
;
diff --git a/components/dashboard/src/tailwind.output.css b/components/dashboard/src/tailwind.output.css
index 49fff65478047c..d52771d1d7a753 100644
--- a/components/dashboard/src/tailwind.output.css
+++ b/components/dashboard/src/tailwind.output.css
@@ -862,6 +862,14 @@ button:hover {
button {
--tw-border-opacity: 1;
border-color: rgba(63, 98, 18, var(--tw-border-opacity));
+}
+
+button:focus {
+ --tw-border-opacity: 1;
+ border-color: rgba(147, 197, 253, var(--tw-border-opacity));
+}
+
+button {
border-radius: 0.375rem;
border-width: 2px;
cursor: pointer;
@@ -869,10 +877,27 @@ button {
line-height: 1.25rem;
margin-top: auto;
margin-bottom: auto;
+}
+
+button:focus {
+ outline: 2px solid transparent;
+ outline-offset: 2px;
+}
+
+button {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 1rem;
padding-right: 1rem;
+}
+
+button:focus {
+ --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+ --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+ box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+}
+
+button {
--tw-text-opacity: 1;
color: rgba(245, 245, 244, var(--tw-text-opacity));
}
diff --git a/components/dashboard/src/workspaces/Workspaces.tsx b/components/dashboard/src/workspaces/Workspaces.tsx
index fff7ddcf6e98f9..df15c25ead3e25 100644
--- a/components/dashboard/src/workspaces/Workspaces.tsx
+++ b/components/dashboard/src/workspaces/Workspaces.tsx
@@ -133,11 +133,10 @@ export class Workspaces extends React.Component
)}
- Template
+ Select Template
{/* separator */}
-
-
-
Select a template to open a workspace
+
+
Select a template to open a workspace.
{this.state?.repos && this.state.repos.map(r => {
const url = gitpodHostUrl.withContext(r.url).toString();
@@ -146,9 +145,6 @@ export class Workspaces extends React.Component
{r.name}
{r.url}
-
- Open
-
;
})}
From f6d774d78f4943a1da9272f2c4fb0e0f7c48efeb Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 00:03:37 +0000
Subject: [PATCH 03/14] Update account deletion modal
---
components/dashboard/src/settings/Account.tsx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/dashboard/src/settings/Account.tsx b/components/dashboard/src/settings/Account.tsx
index 559d749d691b5e..1d677d2a648a86 100644
--- a/components/dashboard/src/settings/Account.tsx
+++ b/components/dashboard/src/settings/Account.tsx
@@ -12,9 +12,11 @@ export default function Account() {
const close = () => setModal(false);
return
- Do you really want to delete your account?
- This action will remove all the data associated with your account in Gitpod and cannot be reversed.
-
+
Delete Account
+
+
Are you sure you want to delete your account? This action will remove all the data associated with your account in Gitpod and cannot be reversed.
+
+
Delete Account
From d41dbfeb8d4974c037830993735edf445a1f5f86 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 00:10:23 +0000
Subject: [PATCH 04/14] Update account header
---
components/dashboard/src/settings/Account.tsx | 2 +-
components/dashboard/src/workspaces/Workspaces.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/dashboard/src/settings/Account.tsx b/components/dashboard/src/settings/Account.tsx
index 1d677d2a648a86..d18fefe47d413b 100644
--- a/components/dashboard/src/settings/Account.tsx
+++ b/components/dashboard/src/settings/Account.tsx
@@ -21,7 +21,7 @@ export default function Account() {
-
+
Profile
From aafd9fc2497d709f94aaa1f2c3c0ae167aa3b566 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 18:18:50 +0000
Subject: [PATCH 05/14] Update profile dropdown
---
components/dashboard/src/components/Menu.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/dashboard/src/components/Menu.tsx b/components/dashboard/src/components/Menu.tsx
index ca2962d3fa2d34..67aabc3de0396e 100644
--- a/components/dashboard/src/components/Menu.tsx
+++ b/components/dashboard/src/components/Menu.tsx
@@ -60,7 +60,7 @@ function Menu(props: { left: Entry[], right: Entry[] }) {
{props.right.map(MenuItem)}
-
+
Date: Sat, 20 Mar 2021 18:57:47 +0000
Subject: [PATCH 06/14] Update search icon and login text colors
---
components/dashboard/src/Login.tsx | 2 +-
components/dashboard/src/workspaces/Workspaces.tsx | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/dashboard/src/Login.tsx b/components/dashboard/src/Login.tsx
index fc3e100db2ed00..1d10537f9c7a4c 100644
--- a/components/dashboard/src/Login.tsx
+++ b/components/dashboard/src/Login.tsx
@@ -67,7 +67,7 @@ export function Login() {
Log in to Gitpod
- ALWAYS READY-TO-CODE
+ ALWAYS READY-TO-CODE
{authProviders.map(ap => {
diff --git a/components/dashboard/src/workspaces/Workspaces.tsx b/components/dashboard/src/workspaces/Workspaces.tsx
index b96b94b74d0314..cbb663898ab55e 100644
--- a/components/dashboard/src/workspaces/Workspaces.tsx
+++ b/components/dashboard/src/workspaces/Workspaces.tsx
@@ -51,9 +51,8 @@ export class Workspaces extends React.Component
{ if (wsModel) wsModel.setSearch(v.target.value) }} />
From 2ad8e9fee8ff0096011c60d83bf8a796628062e7 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 19:13:16 +0000
Subject: [PATCH 07/14] Update header style
---
components/dashboard/src/components/Header.tsx | 4 ++--
components/dashboard/src/workspaces/Workspaces.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/dashboard/src/components/Header.tsx b/components/dashboard/src/components/Header.tsx
index 52a3ad93c5ef43..9f799f3889068b 100644
--- a/components/dashboard/src/components/Header.tsx
+++ b/components/dashboard/src/components/Header.tsx
@@ -9,8 +9,8 @@ export default function Header(p: HeaderProps) {
return
-
{p.title}
- {p.subtitle}
+ {p.title}
+ {p.subtitle}
diff --git a/components/dashboard/src/workspaces/Workspaces.tsx b/components/dashboard/src/workspaces/Workspaces.tsx
index cbb663898ab55e..69b94bdebe8cb2 100644
--- a/components/dashboard/src/workspaces/Workspaces.tsx
+++ b/components/dashboard/src/workspaces/Workspaces.tsx
@@ -46,7 +46,7 @@ export class Workspaces extends React.Component
wsModel!.active = true;
const onAll = () => wsModel!.active = false;
return <>
-
+
From d171d40a8ffd7722648d09996c2fbaa532f9f09a Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 19:18:38 +0000
Subject: [PATCH 08/14] Change filter dropdown hover state color
---
components/dashboard/src/components/DropDown.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/dashboard/src/components/DropDown.tsx b/components/dashboard/src/components/DropDown.tsx
index 2fc8f68d0f844b..ef681469e0160d 100644
--- a/components/dashboard/src/components/DropDown.tsx
+++ b/components/dashboard/src/components/DropDown.tsx
@@ -11,7 +11,7 @@ export interface DropDownProps {
}
function Arrow(props: {up: boolean}) {
- return
+ return
}
function DropDown(props: DropDownProps) {
@@ -26,7 +26,7 @@ function DropDown(props: DropDownProps) {
}
}
})
- const font = "text-gray-400 text-sm leading-1"
+ const font = "text-gray-400 text-sm leading-1 group hover:text-gray-600"
return (
{props.prefix}{current}
From 7bd029b302a774219fe3ed0f4c7e35495886d810 Mon Sep 17 00:00:00 2001
From: George Tsiolis
Date: Sat, 20 Mar 2021 19:47:17 +0000
Subject: [PATCH 09/14] Update headers
---
components/dashboard/src/components/Header.tsx | 2 +-
components/dashboard/src/index.css | 2 +-
components/dashboard/src/settings/EnvironmentVariables.tsx | 2 +-
components/dashboard/src/settings/GitIntegrations.tsx | 4 ++--
components/dashboard/src/settings/Notifications.tsx | 4 ++--
components/dashboard/src/settings/Plans.tsx | 2 +-
components/dashboard/src/settings/Preferences.tsx | 2 +-
components/dashboard/src/settings/SettingsPage.tsx | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/components/dashboard/src/components/Header.tsx b/components/dashboard/src/components/Header.tsx
index 9f799f3889068b..8d52faa796ed93 100644
--- a/components/dashboard/src/components/Header.tsx
+++ b/components/dashboard/src/components/Header.tsx
@@ -7,7 +7,7 @@ export interface HeaderProps {
export default function Header(p: HeaderProps) {
return
-
+
{p.title}
{p.subtitle}
diff --git a/components/dashboard/src/index.css b/components/dashboard/src/index.css
index acbd24bb774316..0afa0cc1990331 100644
--- a/components/dashboard/src/index.css
+++ b/components/dashboard/src/index.css
@@ -44,4 +44,4 @@
@apply bg-gray-100 border-2 border-gray-300 text-gray-400;
}
-}
+}
\ No newline at end of file
diff --git a/components/dashboard/src/settings/EnvironmentVariables.tsx b/components/dashboard/src/settings/EnvironmentVariables.tsx
index cf9d5f94e3d361..ce3728ae4050a8 100644
--- a/components/dashboard/src/settings/EnvironmentVariables.tsx
+++ b/components/dashboard/src/settings/EnvironmentVariables.tsx
@@ -2,7 +2,7 @@ import { SettingsPage } from "./SettingsPage";
export default function EnvVars() {
return
-
+
Environment Variables
;
diff --git a/components/dashboard/src/settings/GitIntegrations.tsx b/components/dashboard/src/settings/GitIntegrations.tsx
index f642103fad729f..46e9c55f1a87b9 100644
--- a/components/dashboard/src/settings/GitIntegrations.tsx
+++ b/components/dashboard/src/settings/GitIntegrations.tsx
@@ -2,8 +2,8 @@ import { SettingsPage } from "./SettingsPage";
export default function GitIntegrations() {
return
-
- Git Hoster Access Control
+
+ Git Providers
;
}
\ No newline at end of file
diff --git a/components/dashboard/src/settings/Notifications.tsx b/components/dashboard/src/settings/Notifications.tsx
index 9db00fc9f325a0..758cd411c65f7b 100644
--- a/components/dashboard/src/settings/Notifications.tsx
+++ b/components/dashboard/src/settings/Notifications.tsx
@@ -53,9 +53,9 @@ export default function Notifications() {
function CheckBox(props: {title: string, desc: string, checked: boolean, onChange: () => void}) {
return
-
+
-
{props.title}
+
{props.title}
{props.desc}
diff --git a/components/dashboard/src/settings/Plans.tsx b/components/dashboard/src/settings/Plans.tsx
index 09543c85b48285..821d0dfd48f615 100644
--- a/components/dashboard/src/settings/Plans.tsx
+++ b/components/dashboard/src/settings/Plans.tsx
@@ -2,7 +2,7 @@ import { SettingsPage } from "./SettingsPage";
export default function Plans() {
return
-
+
Plans
;
diff --git a/components/dashboard/src/settings/Preferences.tsx b/components/dashboard/src/settings/Preferences.tsx
index 03cfeeaf911863..ed03d2c930f8f5 100644
--- a/components/dashboard/src/settings/Preferences.tsx
+++ b/components/dashboard/src/settings/Preferences.tsx
@@ -21,7 +21,7 @@ export default function Preferences() {
}
return
-
+
Default IDE
Choose which IDE you want to use.
diff --git a/components/dashboard/src/settings/SettingsPage.tsx b/components/dashboard/src/settings/SettingsPage.tsx
index 68acc64498e736..0e7fcce7baf5c9 100644
--- a/components/dashboard/src/settings/SettingsPage.tsx
+++ b/components/dashboard/src/settings/SettingsPage.tsx
@@ -13,9 +13,9 @@ export function SettingsPage(p: Props) {
-
+
Profile
+ The following information will be used to set up git configuration. You can override git author name and email per project by using the default environment variables GIT_AUTHOR_NAME and GIT_COMMITTER_EMAIL .