Skip to content

Commit 03bcfb5

Browse files
committed
Style updates for buttons
1 parent 60e9cdb commit 03bcfb5

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

app/javascript/css/components/button.css

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
font-family: var(--sans-serif);
88
line-height: 1.5715;
99
font-weight: 600;
10-
--tw-text-opacity: 1;
11-
color: rgb(255 255 255 / var(--tw-text-opacity));
10+
color: var(--joy-light);
1211
line-height: inherit;
1312

1413
&:is(a) {
@@ -17,8 +16,6 @@
1716

1817
&:hover {
1918
cursor: pointer;
20-
--tw-text-opacity: 1;
21-
color: rgb(255 255 255 / var(--tw-text-opacity));
2219
text-decoration-line: none;
2320
}
2421

@@ -27,12 +24,31 @@
2724
}
2825
&.primary {
2926
background-color: var(--joy-button-primary);
27+
28+
&:hover {
29+
background-color: var(--joy-button-primary-hover);
30+
}
31+
&:active {
32+
background-color: var(--joy-button-primary-active);
33+
}
3034
}
3135
&.secondary {
3236
background-color: var(--joy-button-secondary);
37+
&:hover {
38+
background-color: var(--joy-button-secondary-hover);
39+
}
40+
&:active {
41+
background-color: var(--joy-button-secondary-active);
42+
}
3343
}
3444
&.warn {
3545
background-color: var(--joy-button-warn);
46+
&:hover {
47+
background-color: var(--joy-button-warn-hover);
48+
}
49+
&:active {
50+
background-color: var(--joy-button-warn);
51+
}
3652
}
3753
&.danger {
3854
background-color: var(--joy-button-warn);

app/javascript/css/config/theme.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,15 @@
5151
--joy-link-visited: var(--joy-link-9);
5252
--joy-link-decoration: var(--joy-link-1);
5353
--joy-link-active: var(--joy-link-2);
54+
5455
--joy-button-primary: var(--joy-color-600);
55-
--joy-button-secondary: var(--color-slate-500);
56+
--joy-button-primary-hover: var(--joy-color-700);
57+
--joy-button-primary-active: var(--joy-color-800);
58+
--joy-button-secondary: var(--color-slate-400);
59+
--joy-button-secondary-hover: var(--color-slate-500);
60+
--joy-button-secondary-active: var(--color-slate-600);
5661
--joy-button-warn: var(--color-red-500);
62+
--joy-button-warn-hover: var(--color-red-400);
5763
}
5864

5965
.dark {

0 commit comments

Comments
 (0)