Skip to content

Commit 28c4bdc

Browse files
RazaMMRazaMM
authored
Merge pull request #47 from ccswbs/mm-safari-lists2
Fix safari bug on nested lists and allow columns to be disabled via prop
2 parents bed1f8c + 3a7bc6e commit 28c4bdc

File tree

12 files changed

+180
-28
lines changed

12 files changed

+180
-28
lines changed

‎.changeset/common-eyes-dream.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@uoguelph/react-components': patch
3+
---
4+
5+
Allow columns to be disabled in lists via prop

‎.changeset/fiery-mice-learn.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@uoguelph/react-components': patch
3+
---
4+
5+
Fix safari bug and add container queries for lists

‎.changeset/heavy-areas-grow.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@uoguelph/react-components': patch
3+
---
4+
5+
Update icons for contact email and phone

‎.changeset/large-drinks-make.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@uoguelph/react-components': patch
3+
---
4+
5+
Fix safari bug and add container queries for lists

‎.changeset/pre.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"mode": "pre",
3+
"tag": "rc",
4+
"initialVersions": {
5+
"@uoguelph/react-components": "1.8.0",
6+
"@uoguelph/storybook": "1.0.4",
7+
"@uoguelph/tailwind-theme": "1.0.2",
8+
"@uoguelph/web-components": "2.0.10"
9+
},
10+
"changesets": [
11+
"common-eyes-dream",
12+
"fiery-mice-learn",
13+
"heavy-areas-grow",
14+
"large-drinks-make"
15+
]
16+
}

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/react-components/CHANGELOG.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# @uoguelph/react-components
22

3+
## 1.8.1-rc.3
4+
5+
### Patch Changes
6+
7+
- 8f0685d: Update icons for contact email and phone
8+
9+
## 1.8.1-rc.2
10+
11+
### Patch Changes
12+
13+
- b50bf5e: Allow columns to be disabled in lists via prop
14+
15+
## 1.8.1-rc.1
16+
17+
### Patch Changes
18+
19+
- Fix safari bug and add container queries for lists
20+
21+
## 1.8.1-rc.0
22+
23+
### Patch Changes
24+
25+
- 6f88268: Fix safari bug and add container queries for lists
26+
327
## 1.8.0
428

529
### Minor Changes

‎packages/react-components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uoguelph/react-components",
3-
"version": "1.8.0",
3+
"version": "1.8.1-rc.3",
44
"description": "University of Guelph React Components Library",
55
"type": "module",
66
"scripts": {

‎packages/react-components/src/components/contact/contact-email.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export type ContactEmailProps = {
1414
export function ContactEmail({ email, className }: ContactEmailProps) {
1515
const contactEmail = tv({
1616
slots: {
17-
container: 'flex items-center gap-1',
17+
container: 'flex items-center gap-2',
1818
link: 'text-body-copy-link-on-light underline decoration-current transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none hocus-visible:decoration-transparent',
1919
},
2020
});
@@ -23,7 +23,7 @@ export function ContactEmail({ email, className }: ContactEmailProps) {
2323

2424
return (
2525
<div className={`uofg-contact-email-container ${twMerge(container(), className)}`}>
26-
<FontAwesomeIcon icon={faEnvelope} className="uofg-contact-email-icon me-2" />
26+
<FontAwesomeIcon icon={faEnvelope} className="uofg-contact-email-icon fa-fw" />
2727
<a className={`uofg-contact-email ${link()}`} href={`mailto:${email}`}>
2828
{email}
2929
</a>

‎packages/react-components/src/components/contact/contact-phone.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { faPhone } from '@awesome.me/kit-7993323d0c/icons/classic/solid';
1+
import { faPhone } from '@awesome.me/kit-7993323d0c/icons/classic/regular';
22
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
33
import { twMerge } from 'tailwind-merge';
44
import { tv } from 'tailwind-variants';
@@ -45,7 +45,7 @@ function formatPhoneNumber(phoneNumber: string): string {
4545
export function ContactPhone({ number, extension, className }: ContactPhoneProps) {
4646
const phone = tv({
4747
slots: {
48-
container: 'flex items-center gap-1',
48+
container: 'flex items-center gap-2',
4949
link: 'text-body-copy-link-on-light underline decoration-current transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none hocus-visible:decoration-transparent',
5050
},
5151
});
@@ -57,7 +57,7 @@ export function ContactPhone({ number, extension, className }: ContactPhoneProps
5757

5858
return (
5959
<div className={`uofg-contact-phone-container ${twMerge(container(), className)}`}>
60-
<FontAwesomeIcon icon={faPhone} className="uofg-contact-phone-icon me-2" />
60+
<FontAwesomeIcon icon={faPhone} className="uofg-contact-phone-icon fa-fw" />
6161
<a className={`uofg-contact-phone ${link()}`} href={`tel:${cleanNumber}${extension ? `;${extension}` : ''}`}>
6262
{formattedNumber}{extension && <span className="uofg-contact-phone-extension">, Ext. {extension}</span>}
6363
</a>

0 commit comments

Comments
 (0)