Skip to content

Commit 3615479

Browse files
Style (Calendar): Select and nav button alignment (#372)
* style: select alignment in calendar * chore: add datepicker in page.tsx * Fix: select and nav button height to align better * chore: use vars * docs: remove extra props * docs: remove extra props
1 parent 63197e7 commit 3615479

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

apps/www/src/app/examples/page.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,21 @@ const Page = () => {
161161
onClear={() => setSearch1("")}
162162
/>
163163

164+
164165
<RangePicker footer={<Callout width="100%" type="success">Some important message in the footer</Callout>} />
165166

166167
<RangePicker />
167168

168-
<DatePicker />
169+
<DatePicker
170+
calendarProps={{
171+
captionLayout: 'dropdown',
172+
mode: 'single',
173+
required: true,
174+
selected: undefined
175+
}}
176+
/>
169177

178+
<DatePicker />
170179
<Text
171180
size="large"
172181
weight="medium"

apps/www/src/content/docs/components/calendar/demo.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ export const preview = {
55
tabs: [
66
{
77
name: "Calendar",
8-
code: `<Calendar numberOfMonths={2} />`,
8+
code: `<Calendar />`,
99
},
1010
{
1111
name: "Range Picker",
1212
code: `
13-
<RangePicker inputFieldsProps={{ startDate: { size: "large" } }} />`,
13+
<RangePicker side="bottom" />`,
1414
},
1515
{
1616
name: "Date Picker",
1717
code: `
1818
<Flex style={{height:200}}>
19-
<DatePicker inputFieldsProps={{ startDate: { size: "large" } }}}} />
19+
<DatePicker />
2020
</Flex>`,
2121
},
2222
],

packages/raystack/v1/components/calendar/calendar.module.css

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
color: var(--rs-color-foreground-base-primary);
3333
background: var(--rs-color-background-base-primary);
3434
cursor: pointer;
35-
height: 20px;
35+
height: var(--rs-space-7);
3636
}
3737

3838
.nav_button:disabled {
@@ -66,6 +66,7 @@
6666
position: relative;
6767
width: fit-content;
6868
margin: 0 auto var(--rs-space-4) auto;
69+
height: var(--rs-space-7);
6970
}
7071

7172
.day {
@@ -201,25 +202,16 @@
201202
gap: var(--rs-space-3);
202203
}
203204

204-
.dropdown_trigger,
205-
.dropdown_trigger:focus {
206-
border: none;
207-
outline: none;
208-
box-shadow: none;
205+
.dropdown_trigger {
209206
padding: var(--rs-space-1) var(--rs-space-3);
210207
}
211208

212-
.dropdown_trigger:hover {
213-
background-color: var(--rs-color-background-base-primary-hover);
214-
}
215-
216209
.dropdown_icon {
217-
margin-left: var(--rs-space-2);
210+
margin-left: var(--rs-space-1);
218211
}
219212

220213
.dropdown_content {
221214
max-height: 400px;
222-
/* border: 1px solid var(--rs-color-border-base-primary); */
223215
}
224216

225217
.disabled {
@@ -230,11 +222,11 @@
230222
.day.today button::after {
231223
content: '';
232224
position: absolute;
233-
bottom: 4px;
225+
bottom: var(--rs-space-2);
234226
left: 50%;
235227
transform: translateX(-50%);
236-
width: 4px;
237-
height: 4px;
228+
width: var(--rs-space-2);
229+
height: var(--rs-space-2);
238230
border-radius: 50%;
239231
background-color: var(--rs-color-background-accent-emphasis);
240232
}

packages/raystack/v1/components/calendar/calendar.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ function DropDown({
6666
className: styles.dropdown_icon,
6767
}}
6868
stopPropagation={true}
69+
size="small"
70+
variant="text"
6971
>
7072
<Select.Value />
7173
</Select.Trigger>

0 commit comments

Comments
 (0)