Skip to content

Commit ae06897

Browse files
committed
Update styles for buttons, selects, color scheme
1 parent 1677367 commit ae06897

File tree

5 files changed

+32
-9
lines changed

5 files changed

+32
-9
lines changed

app/javascript/css/application.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
@import './components/logo.css';
2424
@import './components/button.css';
25+
@import './components/select.css';
2526
@import './components/code.scss';
2627
@import './components/page-header.css';
2728
@import './components/skip-to-content.css';
@@ -32,4 +33,4 @@
3233
@import './components/newsletter-banner.css';
3334
@import './components/anchors.scss';
3435
@import './components/callout.css';
35-
@import './components/color-theme.scss';
36+
@import './components/color-scheme.scss';

app/javascript/css/components/button.css

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
.button {
2+
border: 1px solid var(--joy-border-subtle);
23
border-radius: 0.375rem;
3-
padding: 0.625rem 0.75rem;
4+
padding: 0.75rem;
45
display: inline-flex;
56
align-items: center;
67
font-size: 0.875rem;
78
font-family: var(--sans-serif);
89
line-height: 1.5715;
910
font-weight: 600;
1011
color: var(--joy-light);
11-
line-height: inherit;
12+
line-height: 1rem;
1213

1314
&:is(a) {
1415
text-decoration: none;
@@ -23,6 +24,7 @@
2324
display: none;
2425
}
2526
&.primary {
27+
border: 1px solid var(--joy-button-primary);
2628
background-color: var(--joy-button-primary);
2729

2830
&:hover {
@@ -34,13 +36,24 @@
3436
}
3537
&.secondary {
3638
background-color: var(--joy-button-secondary);
39+
color: var(--joy-text);
3740
&:hover {
3841
background-color: var(--joy-button-secondary-hover);
3942
}
4043
&:active {
4144
background-color: var(--joy-button-secondary-active);
4245
}
4346
}
47+
&.tertiary {
48+
border: 1px solid var(--joy-button-tertiary);
49+
background-color: var(--joy-button-tertiary);
50+
&:hover {
51+
background-color: var(--joy-button-tertiary-hover);
52+
}
53+
&:active {
54+
background-color: var(--joy-button-tertiary-active);
55+
}
56+
}
4457
&.warn {
4558
background-color: var(--joy-button-warn);
4659
&:hover {

app/javascript/css/components/color-theme.scss renamed to app/javascript/css/components/color-scheme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@import '../config/variables.scss';
22

3-
.color-theme {
3+
.color-scheme {
44
color: var(--joy-background-clean);
55
display: flex;
66
flex-direction: column;
77
border-radius: 0.5rem;
88
}
99

1010
@media screen and (min-width: $screen-md) {
11-
.color-theme {
11+
.color-scheme {
1212
flex-direction: row;
1313
}
1414
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
select {
2+
font-size: 0.875rem;
3+
padding: 0.625rem;
4+
border-radius: 0.5rem;
5+
display: block;
6+
}

app/javascript/css/config/theme.css

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
--joy-text: var(--color-dark);
4545
--joy-text-subtle: var(--color-stone-700);
46-
--joy-text-emphasis: var(--joy-color-700);
46+
--joy-text-emphasis: var(--joy-color-500);
4747
--joy-text-heading: var(--color-slate-900);
4848
--joy-text-theme: var(--joy-color-800);
4949

@@ -55,9 +55,12 @@
5555
--joy-button-primary: var(--joy-color-600);
5656
--joy-button-primary-hover: var(--joy-color-700);
5757
--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);
58+
--joy-button-secondary: var(--joy-light);
59+
--joy-button-secondary-hover: var(--joy-color-50);
60+
--joy-button-secondary-active: var(--joy-color-100);
61+
--joy-button-tertiary: var(--color-slate-400);
62+
--joy-button-tertiary-hover: var(--color-slate-500);
63+
--joy-button-tertiary-active: var(--color-slate-600);
6164
--joy-button-warn: var(--color-red-500);
6265
--joy-button-warn-hover: var(--color-red-400);
6366
}

0 commit comments

Comments
 (0)