Skip to content

Commit 03af17a

Browse files
committed
chore(many): rebase from latest master
1 parent b200bac commit 03af17a

File tree

77 files changed

+1494
-1300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1494
-1300
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@testing-library/user-event": "^14.6.1",
6363
"@types/jest": "^29.5.14",
6464
"@types/node": "^22",
65-
"@types/react-dom": "^18.3.0",
65+
"@types/react-dom": "^19.1",
6666
"@vitejs/plugin-react": "^4.5.1",
6767
"@vitest/eslint-plugin": "^1.2.1",
6868
"chai": "^4.4.1",

packages/__docs__/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"@instructure/ui-byline": "10.25.0",
4646
"@instructure/ui-calendar": "10.25.0",
4747
"@instructure/ui-checkbox": "10.25.0",
48-
"@instructure/ui-code-editor": "10.25.0",
4948
"@instructure/ui-color-picker": "10.25.0",
5049
"@instructure/ui-color-utils": "10.25.0",
5150
"@instructure/ui-date-input": "10.25.0",

packages/__docs__/src/Header/index.tsx

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -134,31 +134,28 @@ class Header extends Component<HeaderProps> {
134134

135135
render() {
136136
const { versionsData } = this.props
137-
const corpLogo = <InlineSVG width="200px" src={logo} />
138137
return (
139138
<View as="div" margin="none none medium" padding="none medium">
140-
<Heading variant="titlePageDesktop" level="h2" as="div">
141-
<Link href="#index" isWithinText={false} display="block">
142-
<View display="block" textAlign="center">
143-
{corpLogo}
144-
<ScreenReaderContent>Instructure logo</ScreenReaderContent>
145-
</View>
146-
</Link>
139+
<Link href="#index" isWithinText={false} display="block">
147140
<View display="block" textAlign="center">
148-
{versionsData ? (
149-
this.renderVersionsBlock()
150-
) : (
151-
<Link href="#index" isWithinText={false} display="block">
152-
<View display="block" margin="small none none">
153-
<Text size="large">
154-
{this.props.name}
155-
{this.props.version}
156-
</Text>
157-
</View>
158-
</Link>
159-
)}
141+
<InlineSVG src={logo} height="6rem" fontSize="12rem" />
142+
<ScreenReaderContent>Instructure logo</ScreenReaderContent>
160143
</View>
161-
</Heading>
144+
</Link>
145+
<View display="block" textAlign="center">
146+
{versionsData ? (
147+
this.renderVersionsBlock()
148+
) : (
149+
<Link href="#index" isWithinText={false} display="block">
150+
<View display="block" margin="small none none">
151+
<Text size="large">
152+
{this.props.name}
153+
{this.props.version}
154+
</Text>
155+
</View>
156+
</Link>
157+
)}
158+
</View>
162159
</View>
163160
)
164161
}

packages/emotion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@instructure/ui-react-utils": "10.25.0",
3434
"@instructure/ui-themes": "10.25.0",
3535
"@instructure/ui-utils": "10.25.0",
36-
"hoist-non-react-statics": "^3.3.2",
36+
"hoist-non-react-statics": "^3.3.2"
3737
},
3838
"devDependencies": {
3939
"@instructure/ui-babel-preset": "10.25.0",

packages/ui-a11y-content/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@babel/runtime": "^7.27.6",
2727
"@instructure/emotion": "10.25.0",
2828
"@instructure/shared-types": "10.25.0",
29-
"@instructure/ui-react-utils": "10.25.0",
29+
"@instructure/ui-react-utils": "10.25.0"
3030
},
3131
"devDependencies": {
3232
"@instructure/ui-axe-check": "10.25.0",

packages/ui-alerts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@instructure/ui-react-utils": "10.25.0",
4545
"@instructure/ui-themes": "10.25.0",
4646
"@instructure/ui-view": "10.25.0",
47-
"keycode": "^2",
47+
"keycode": "^2"
4848
},
4949
"peerDependencies": {
5050
"react": ">=18 <=19",

packages/ui-avatar/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@instructure/shared-types": "10.25.0",
2929
"@instructure/ui-icons": "10.25.0",
3030
"@instructure/ui-react-utils": "10.25.0",
31-
"@instructure/ui-view": "10.25.0",
31+
"@instructure/ui-view": "10.25.0"
3232
},
3333
"devDependencies": {
3434
"@instructure/ui-axe-check": "10.25.0",

packages/ui-badge/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@instructure/ui-color-utils": "10.25.0",
3030
"@instructure/ui-position": "10.25.0",
3131
"@instructure/ui-react-utils": "10.25.0",
32-
"@instructure/ui-view": "10.25.0",
32+
"@instructure/ui-view": "10.25.0"
3333
},
3434
"devDependencies": {
3535
"@instructure/ui-axe-check": "10.25.0",

packages/ui-billboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@instructure/ui-heading": "10.25.0",
4141
"@instructure/ui-img": "10.25.0",
4242
"@instructure/ui-react-utils": "10.25.0",
43-
"@instructure/ui-view": "10.25.0",
43+
"@instructure/ui-view": "10.25.0"
4444
},
4545
"peerDependencies": {
4646
"react": ">=18 <=19"

0 commit comments

Comments
 (0)