Skip to content

Update kumquat colors #18616

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 29, 2023
Merged

Update kumquat colors #18616

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
4 changes: 2 additions & 2 deletions components/dashboard/src/admin/BlockedEmailDomains.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function BlockedDomainEntry(props: {
},
];
return (
<div className="rounded whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="flex flex-col w-9/12 truncate">
<span className="mr-3 text-lg text-gray-600 truncate">{props.br.domain}</span>
</div>
Expand Down Expand Up @@ -248,7 +248,7 @@ function Details(props: {
return (
<div className="border-gray-200 dark:border-gray-800 -mx-6 px-6 py-4 flex flex-col">
{props.error ? (
<div className="bg-gitpod-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{props.error}</div>
<div className="bg-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{props.error}</div>
) : null}
<div>
<h4>Domain (may contain '%' as wild card)</h4>
Expand Down
4 changes: 2 additions & 2 deletions components/dashboard/src/admin/BlockedRepositories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function BlockedRepositoryEntry(props: { br: BlockedRepository; confirmedDelete:
},
];
return (
<div className="rounded whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="flex flex-col w-9/12 truncate">
<span className="mr-3 text-lg text-gray-600 truncate">{props.br.urlRegexp}</span>
</div>
Expand Down Expand Up @@ -273,7 +273,7 @@ function Details(props: {
return (
<div className="border-gray-200 dark:border-gray-800 -mx-6 px-6 py-4 flex flex-col">
{props.error ? (
<div className="bg-gitpod-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{props.error}</div>
<div className="bg-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{props.error}</div>
) : null}
<div>
<h4>Repository URL RegEx</h4>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/admin/ProjectsSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export function ProjectsSearch() {
to={"/admin/projects/" + p.project.id}
data-analytics='{"button_type":"sidebar_menu"}'
>
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="flex flex-col w-4/12 truncate">
<div className="font-medium text-gray-800 dark:text-gray-100 truncate">{p.project.name}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/admin/TeamsSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function TeamsSearch() {
to={"/admin/orgs/" + props.team.id}
data-analytics='{"button_type":"sidebar_menu"}'
>
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="flex flex-col w-7/12 truncate">
<div className="font-medium text-gray-800 dark:text-gray-100 truncate max-w-sm">
{props.team.name}
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/admin/UserSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function UserEntry(p: { user: User }) {
const email = User.getPrimaryEmail(p.user) || "---";
return (
<Link key={p.user.id} to={"/admin/users/" + p.user.id} data-analytics='{"button_type":"sidebar_menu"}'>
<div className="rounded-xl whitespace-nowrap flex space-x-2 py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded-xl whitespace-nowrap flex space-x-2 py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="pr-3 self-center w-1/12">
<img className="rounded-full" src={p.user.avatarUrl} alt={p.user.fullName || p.user.name} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/admin/WorkspacesSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function WorkspaceEntry(p: { ws: WorkspaceAndInstance }) {
to={"/admin/workspaces/" + p.ws.workspaceId}
data-analytics='{"button_type":"sidebar_menu"}'
>
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded-xl whitespace-nowrap flex py-6 px-6 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="pr-3 self-center w-8">
<WorkspaceStatusIndicator instance={WorkspaceAndInstance.toInstance(p.ws)} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/components/ItemsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function Item(props: { children?: React.ReactNode; className?: string; he
// cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700
const solidClassName = props.solid ? "bg-gray-100 dark:bg-gray-800" : "hover:bg-gray-100 dark:hover:bg-gray-800";
const headerClassName = "text-sm text-gray-400 border-t border-b border-gray-200 dark:border-gray-800";
const notHeaderClassName = "rounded-xl focus:bg-gitpod-kumquat-light " + solidClassName;
const notHeaderClassName = "rounded-xl focus:bg-kumquat-light " + solidClassName;
return (
<div
className={`flex flex-grow flex-row w-full p-3 justify-between transition ease-in-out ${
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/projects/Projects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default function ProjectsPage() {
{!searchFilter && (
<div
key="new-project"
className="h-52 border-dashed border-2 border-gray-100 dark:border-gray-800 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-xl focus:bg-gitpod-kumquat-light transition ease-in-out group"
className="h-52 border-dashed border-2 border-gray-100 dark:border-gray-800 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-xl focus:bg-kumquat-light transition ease-in-out group"
>
<Link to={projectsPathNew} data-analytics='{"button_type":"card"}'>
<div className="flex h-full">
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/projects/new-project/NewProjectRepoList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const NewProjectRepoList: FC<Props> = ({ filteredRepos, noReposAvailable,
{filteredRepos.map((r, index) => (
<div
key={`repo-${index}-${r.account}-${r.name}`}
className="flex p-3 rounded-xl hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light transition ease-in-out group"
className="flex p-3 rounded-xl hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light transition ease-in-out group"
title={r.cloneUrl}
>
<div className="flex-grow">
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/start/StartWorkspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
statusMessage = (
<div>
<div className="flex space-x-3 items-center text-left rounded-xl m-auto px-4 h-16 w-72 mt-4 bg-gray-100 dark:bg-gray-800">
<div className="rounded-full w-3 h-3 text-sm bg-gitpod-kumquat">&nbsp;</div>
<div className="rounded-full w-3 h-3 text-sm bg-kumquat-ripe">&nbsp;</div>
<div>
<p className="text-gray-700 dark:text-gray-200 font-semibold w-56 truncate">
{this.state.workspaceInstance.workspaceId}
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/teams/sso/OIDCClientListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const OIDCClientListItem: FC<Props> = ({ clientConfig, hasActiveConfig, o
(clientConfig.active
? "bg-green-500"
: clientConfig.verified
? "bg-gitpod-kumquat"
? "bg-kumquat-ripe"
: "bg-gray-400")
}
>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/user-settings/EnvironmentVariables.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function AddEnvVarModal(p: EnvVarModalProps) {
<ModalHeader>{isNew ? "New" : "Edit"} Variable</ModalHeader>
<ModalBody>
{error ? (
<div className="bg-gitpod-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{error}</div>
<div className="bg-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{error}</div>
) : null}
<div>
<h4>Name</h4>
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/user-settings/TokenEntry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function TokenEntry(props: TokenEntryProps) {
};

return (
<div className="rounded-xl whitespace-nowrap flex space-x-2 py-4 px-4 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-gitpod-kumquat-light group">
<div className="rounded-xl whitespace-nowrap flex space-x-2 py-4 px-4 w-full justify-between hover:bg-gray-100 dark:hover:bg-gray-800 focus:bg-kumquat-light group">
<div className="flex items-center pr-3 w-4/12">
<span className="truncate">{props.token.name || ""}</span>
</div>
Expand Down
4 changes: 1 addition & 3 deletions components/dashboard/src/workspaces/RenameWorkspaceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ export const RenameWorkspaceModal: FunctionComponent<Props> = ({ workspace, onCl
<ModalHeader>Rename Workspace Description</ModalHeader>
<ModalBody>
{errorMessage.length > 0 ? (
<div className="bg-gitpod-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">
{errorMessage}
</div>
<div className="bg-kumquat-light rounded-md p-3 text-gitpod-red text-sm mb-2">{errorMessage}</div>
) : null}
<input
autoFocus
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/workspaces/WorkspaceStatusIndicator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function WorkspaceStatusIndicator({ instance }: { instance?: WorkspaceIns
break;
}
default: {
stateClassName += " bg-gitpod-kumquat animate-pulse";
stateClassName += " bg-kumquat-ripe animate-pulse";
break;
}
}
Expand Down