Skip to content

[pull] main from Stirling-Tools:main #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 25, 2026
Merged

[pull] main from Stirling-Tools:main #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/editor/src/core/components/tools/sign/SignSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ const SignSettings = ({
gap: "0.4rem",
}}
>
<LocalIcon icon="pause-rounded" width={20} height={20} />
<LocalIcon icon="pause-circle-rounded" width={20} height={20} />
<Text component="span" size="sm" fw={500}>
{translate("mode.pause", "Pause placement")}
</Text>
Expand Down
4 changes: 2 additions & 2 deletions frontend/editor/src/core/components/viewer/CommentsSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const TOOL_ICON_MAP: Record<string, string> = {
squiggly: "show-chart",
ink: "edit",
inkHighlighter: "brush",
square: "crop-square",
square: "crop-square-outline",
circle: "radio-button-unchecked",
line: "show-chart",
lineArrow: "show-chart",
Expand All @@ -144,7 +144,7 @@ function getIconByType(type: number | undefined): string {
if (type === 1) return "comment";
if (type === 3) return "sticky-note-2";
if (type === 4 || type === 8) return "show-chart";
if (type === 5) return "crop-square";
if (type === 5) return "crop-square-outline";
if (type === 6) return "radio-button-unchecked";
if (type === 7 || type === 8) return "change-history";
if (type === 9) return "highlight";
Expand Down
2 changes: 1 addition & 1 deletion frontend/editor/src/core/tools/annotate/AnnotationPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export function AnnotationPanel(props: AnnotationPanelProps) {
{
id: "square",
label: t("annotation.square", "Square"),
icon: "crop-square",
icon: "crop-square-outline",
},
{
id: "circle",
Expand Down
6 changes: 1 addition & 5 deletions ...d/editor/src/proprietary/components/shared/config/configSections/AdminDatabaseSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,11 +797,7 @@ export default function AdminDatabaseSection() {
</Button>
<Button
leftSection={
<LocalIcon
icon="cloud-upload"
width="1rem"
height="1rem"
/>
<LocalIcon icon="upload" width="1rem" height="1rem" />
}
onClick={handleCreateBackup}
loading={creatingBackup}
Expand Down
12 changes: 2 additions & 10 deletions frontend/editor/src/saas/components/tools/sign/SignSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,11 +1169,7 @@ const SignSettings = ({
gap: "0.4rem",
}}
>
<LocalIcon
icon="material-symbols:pause-rounded"
width={20}
height={20}
/>
<LocalIcon icon="pause-circle-rounded" width={20} height={20} />
<Text component="span" size="sm" fw={500}>
{translate("mode.pause", "Pause placement")}
</Text>
Expand All @@ -1197,11 +1193,7 @@ const SignSettings = ({
gap: "0.4rem",
}}
>
<LocalIcon
icon="material-symbols:play-arrow-rounded"
width={20}
height={20}
/>
<LocalIcon icon="play-arrow-rounded" width={20} height={20} />
<Text component="span" size="sm" fw={500}>
{translate("mode.resume", "Resume placement")}
</Text>
Expand Down
Loading