Skip to content

Commit 7f247d7

Browse files
committed
Update primary button style
1 parent 1dd51ca commit 7f247d7

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

components/dashboard/src/components/Button.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,10 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
4949
className={classNames(
5050
"cursor-pointer my-auto",
5151
"text-sm font-medium whitespace-nowrap",
52-
"rounded-md focus:outline-none focus:ring transition ease-in-out",
52+
"rounded-xl focus:outline-none focus:ring transition ease-in-out",
5353
spacing === "compact" ? ["px-1 py-1"] : null,
5454
spacing === "default" ? ["px-4 py-2"] : null,
55-
type === "primary"
56-
? [
57-
"bg-green-600 dark:bg-green-700 hover:bg-green-700 dark:hover:bg-green-600",
58-
"text-gray-100 dark:text-green-100",
59-
]
60-
: null,
55+
type === "primary" ? ["bg-gitpod-kumquat", "text-gray-800 dark:text-gray-900"] : null,
6156
type === "secondary"
6257
? [
6358
"bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600",

components/dashboard/src/components/SelectableCardSolid.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ function SelectableCardSolid(props: SelectableCardSolidProps) {
2727

2828
return (
2929
<div
30-
className={`rounded-xl px-3 py-3 flex flex-col cursor-pointer group transition ease-in-out ${
30+
className={`rounded-xl px-2 py-2 flex flex-col cursor-pointer group transition ease-in-out ${
3131
isFocused ? "ring-2 ring-blue-500" : ""
3232
} ${
3333
props.selected
34-
? "bg-gray-800 dark:bg-gray-100"
35-
: "bg-gray-100 dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-700"
34+
? "border-4 border-gray-500 dark:border-gray-50"
35+
: "hover:bg-gray-100 dark:hover:bg-gray-800 border-4 border-gray-100 dark:border-gray-800"
3636
} ${props.className || ""}`}
3737
onClick={props.onClick}
3838
>
3939
<div className="flex items-center">
4040
<p
4141
className={`w-full pl-1 text-base font-semibold truncate ${
42-
props.selected ? "text-gray-100 dark:text-gray-600" : "text-gray-600 dark:text-gray-500"
42+
props.selected ? "text-gray-600 dark:text-gray-400" : "text-gray-600 dark:text-gray-400"
4343
}`}
4444
title={props.title}
4545
>

components/dashboard/src/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@layer components {
5555
/* TODO: deprecate button styles in favor of using <Button> component and handling there */
5656
button {
57-
@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;
57+
@apply cursor-pointer px-4 py-2 my-auto bg-gitpod-kumquat text-gray-800 text-sm font-medium rounded-xl focus:outline-none focus:ring transition ease-in-out;
5858
}
5959
button.secondary {
6060
@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;

components/dashboard/tailwind.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ module.exports = {
2828
sky: colors.sky,
2929
rose: colors.rose,
3030
"gitpod-black": "#161616",
31-
"gitpod-gray": "#8E8787",
3231
"gitpod-red": "#CE4A3E",
33-
"gitpod-kumquat-light": "#FFE4BC",
3432
"gitpod-kumquat": "#FFB45B",
35-
"gitpod-kumquat-dark": "#FF8A00",
36-
"gitpod-kumquat-darker": "#f28300",
3733
"gitpod-kumquat-gradient": "linear-gradient(137.41deg, #FFAD33 14.37%, #FF8A00 91.32%)",
3834
},
3935
container: {

0 commit comments

Comments
 (0)