Skip to content

Update primary button style #18319

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

Update primary button style #18319

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/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const Login: FC<LoginProps> = ({ onLoggedIn }) => {
{providerFromContext ? (
<button
key={"button" + providerFromContext.host}
className="btn-login flex-none w-56 h-10 p-0 inline-flex"
className="btn-login flex-none w-56 h-10 p-0 inline-flex rounded-xl"
onClick={() => openLogin(providerFromContext!.host)}
>
{iconForAuthProvider(providerFromContext.authProviderType)}
Expand All @@ -167,7 +167,7 @@ export const Login: FC<LoginProps> = ({ onLoggedIn }) => {
authProviders.data?.map((ap) => (
<button
key={"button" + ap.host}
className="btn-login flex-none w-56 h-10 p-0 inline-flex"
className="btn-login flex-none w-56 h-10 p-0 inline-flex rounded-xl"
onClick={() => openLogin(ap.host)}
>
{iconForAuthProvider(ap.authProviderType)}
Expand Down
6 changes: 3 additions & 3 deletions components/dashboard/src/components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
className={classNames(
"cursor-pointer my-auto",
"text-sm font-medium whitespace-nowrap",
"rounded-md focus:outline-none focus:ring transition ease-in-out",
"rounded-xl focus:outline-none focus:ring transition ease-in-out",
spacing === "compact" ? ["px-1 py-1"] : null,
spacing === "default" ? ["px-4 py-2"] : null,
type === "primary"
? [
"bg-green-600 dark:bg-green-700 hover:bg-green-700 dark:hover:bg-green-600",
"text-gray-100 dark:text-green-100",
"bg-gray-900 hover:bg-gray-800 dark:bg-kumquat-base dark:hover:bg-kumquat-ripe",
"text-gray-50 dark:text-gray-900",
]
: null,
type === "secondary"
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/components/EmptyMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const EmptyMessage: FC<Props> = ({ title, subtitle, buttonText, onClick,
return (
<div
className={classNames(
"w-full flex justify-center mt-2 rounded-xl bg-gray-100 dark:bg-gray-900 px-4 py-14",
"w-full flex justify-center mt-2 rounded-xl bg-gray-100 dark:bg-gray-800 px-4 py-14",
className,
)}
>
Expand Down
8 changes: 4 additions & 4 deletions components/dashboard/src/components/SelectableCardSolid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ function SelectableCardSolid(props: SelectableCardSolidProps) {

return (
<div
className={`rounded-xl px-3 py-3 flex flex-col cursor-pointer group transition ease-in-out ${
className={`rounded-xl px-2 py-2 flex flex-col cursor-pointer group transition ease-in-out ${
isFocused ? "ring-2 ring-blue-500" : ""
} ${
props.selected
? "bg-gray-800 dark:bg-gray-100"
: "bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700"
? "border-4 border-gray-500 dark:border-gray-50"
: "hover:bg-gray-100 dark:hover:bg-gray-800 border-4 border-gray-100 dark:border-gray-800"
} ${props.className || ""}`}
onClick={props.onClick}
>
<div className="flex items-center">
<p
className={`w-full pl-1 text-base font-semibold truncate ${
props.selected ? "text-gray-100 dark:text-gray-600" : "text-gray-600 dark:text-gray-500"
props.selected ? "text-gray-600 dark:text-gray-400" : "text-gray-600 dark:text-gray-400"
}`}
title={props.title}
>
Expand Down
4 changes: 2 additions & 2 deletions components/dashboard/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
@layer components {
/* TODO: deprecate button styles in favor of using <Button> component and handling there */
button {
@apply cursor-pointer px-4 py-2 my-auto bg-green-600 dark:bg-green-700 hover:bg-green-700 dark:hover:bg-green-600 text-gray-100 dark:text-green-100 text-sm font-medium rounded-md focus:outline-none focus:ring transition ease-in-out;
@apply cursor-pointer px-4 py-2 my-auto bg-gray-900 hover:bg-gray-800 dark:bg-kumquat-base dark:hover:bg-kumquat-ripe text-gray-50 dark:text-gray-900 text-sm font-medium rounded-xl focus:outline-none focus:ring transition ease-in-out;
}
button.secondary {
@apply bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 text-gray-500 dark:text-gray-100 hover:text-gray-600;
Expand All @@ -78,7 +78,7 @@
}

code {
@apply bg-gray-100 dark:bg-gray-700 px-1.5 py-0.5 rounded-md text-sm font-mono font-medium;
@apply bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded-md text-sm font-mono font-medium;
}

textarea,
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/user-settings/Integrations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ function GitIntegrations() {
</div>

{providers && providers.length === 0 && (
<div className="w-full flex h-80 mt-2 rounded-xl bg-gray-100 dark:bg-gray-900">
<div className="w-full flex h-80 mt-2 rounded-xl bg-gray-100 dark:bg-gray-800">
<div className="m-auto text-center">
<Heading2 color="light" className="self-center mb-4">
No Git Integrations
Expand Down
27 changes: 15 additions & 12 deletions components/dashboard/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,29 @@ module.exports = {
theme: {
extend: {
colors: {
gray: colors.warmGray,
green: colors.lime,
orange: colors.amber,
blue: {
light: "#75A9EC",
DEFAULT: "#5C8DD6",
dark: "#265583",
},
// TODO: figure out if we want to just pull in the specific gitpod-* colors
teal: colors.teal,
sky: colors.sky,
rose: colors.rose,
"gitpod-black": "#161616",
"gitpod-gray": "#8E8787",
"gitpod-red": "#CE4A3E",
"gitpod-kumquat-light": "#FFE4BC",
"gitpod-kumquat": "#FFB45B",
"gitpod-kumquat-dark": "#FF8A00",
"gitpod-kumquat-darker": "#f28300",
"gitpod-kumquat-gradient": "linear-gradient(137.41deg, #FFAD33 14.37%, #FF8A00 91.32%)",
"kumquat-dark": "#FF8A00",
"kumquat-base": "#FFAE33",
"kumquat-ripe": "#FFB45B",
"kumquat-light": "#FFE4BC",
"kumquat-gradient": "linear-gradient(137.41deg, #FFAD33 14.37%, #FF8A00 91.32%)",
"gray-900": "#12100C",
"gray-800": "#23211E",
"gray-700": "#514F4D",
"gray-600": "#565451",
"gray-500": "#666564",
"gray-400": "#999795",
"gray-300": "#DADADA",
"gray-200": "#ECE7E5",
"gray-100": "#F5F4F4",
"gray-50": "#F9F9F9",
},
container: {
center: true,
Expand Down