Skip to content

Commit 882514e

Browse files
SaerisSaeris
committed
🧹 Cleanup Merge Conflicts, Fix Typecheck Errors
1 parent d598080 commit 882514e

File tree

10 files changed

+248
-1612
lines changed

10 files changed

+248
-1612
lines changed

‎packages/app/src/app/components/CreateNewSandbox/CreateSandbox/Import/Import.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export const Import = () => {
116116
<ButtonContainer>
117117
<Button
118118
small
119-
style={{ fontSize: 11 }}
119+
css="font-size: 11"
120120
onClick={() => {
121121
copyToClipboard(transformedUrl);
122122
}}
@@ -126,7 +126,7 @@ export const Import = () => {
126126
</Button>
127127
<Button
128128
small
129-
style={{ fontSize: 11 }}
129+
css="font-size: 11"
130130
disabled={!transformedUrl}
131131
to={gitHubToSandboxUrl(url)}
132132
>
@@ -159,7 +159,7 @@ export const Import = () => {
159159
<SignInButton />
160160
) : (
161161
<StackbitButton
162-
style={{ fontSize: 11 }}
162+
css="font-size: 11"
163163
username={state.user.username}
164164
/>
165165
)}

‎packages/app/src/app/components/CreateNewSandbox/CreateSandbox/Welcome/Welcome.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const Welcome = ({ goToTab }: { goToTab: (event: any) => void }) => {
4444
</li>
4545
</Features>
4646
<Actions>
47-
<Button small style={{ fontSize: 12, width: 200 }} onClick={goToTab}>
47+
<Button small css=" width: 200; font-size: 12;" onClick={goToTab}>
4848
Create Sandbox
4949
</Button>
5050
</Actions>

‎packages/app/src/app/pages/Dashboard/Content/routes/TeamView/AddTeamMember/index.tsx

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎packages/app/src/app/pages/Sandbox/Editor/Workspace/Project/BookmarkTemplateButton/BookmarkTemplateButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ export const BookmarkTemplateButton = ({ style }: IBookmarkTemplateButton) => {
114114
: `Bookmark Template`
115115
}
116116
>
117-
{bookmarkInfos.map(({ entity: { name } }, i: number) => (
117+
{(bookmarkInfos as any).map(({ entity: { name } }, i: number) => (
118118
<button
119119
type="button"
120120
key={name}
121121
// @ts-ignore
122-
onClick={(e, menu) => {
122+
onClick={(e: React.MouseEventHandler, menu) => {
123123
// TODO: find a way to pass menu so we can close it after handling our action
124124
handleToggleFollow(i);
125125
menu.hide();

‎packages/app/src/app/pages/Sandbox/SignOutNoticeModal/SignOutNotice.tsx

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎packages/app/src/app/pages/Sandbox/SignOutNoticeModal/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/common/src/components/Button/elements.tsx

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎packages/common/src/components/Button/index.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)