From 0d681a533a17286f2f5164db6c2f8ec71da478de Mon Sep 17 00:00:00 2001 From: Henry Sloan Date: Sat, 24 Jul 2021 00:42:48 -0400 Subject: [PATCH] Rename align operations and icons (#295) * Rename align operations and icons * Fix icon import paths --- ...lign-vertical-bottom.svg => align-bottom.svg} | 0 ...{align-horizontal-left.svg => align-left.svg} | 0 ...lign-horizontal-right.svg => align-right.svg} | 0 .../{align-vertical-top.svg => align-top.svg} | 0 .../src/components/widgets/labels/IconLabel.vue | 16 ++++++++-------- .../components/widgets/options/ToolOptions.vue | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) rename client/web/assets/16px-solid/{align-vertical-bottom.svg => align-bottom.svg} (100%) rename client/web/assets/16px-solid/{align-horizontal-left.svg => align-left.svg} (100%) rename client/web/assets/16px-solid/{align-horizontal-right.svg => align-right.svg} (100%) rename client/web/assets/16px-solid/{align-vertical-top.svg => align-top.svg} (100%) diff --git a/client/web/assets/16px-solid/align-vertical-bottom.svg b/client/web/assets/16px-solid/align-bottom.svg similarity index 100% rename from client/web/assets/16px-solid/align-vertical-bottom.svg rename to client/web/assets/16px-solid/align-bottom.svg diff --git a/client/web/assets/16px-solid/align-horizontal-left.svg b/client/web/assets/16px-solid/align-left.svg similarity index 100% rename from client/web/assets/16px-solid/align-horizontal-left.svg rename to client/web/assets/16px-solid/align-left.svg diff --git a/client/web/assets/16px-solid/align-horizontal-right.svg b/client/web/assets/16px-solid/align-right.svg similarity index 100% rename from client/web/assets/16px-solid/align-horizontal-right.svg rename to client/web/assets/16px-solid/align-right.svg diff --git a/client/web/assets/16px-solid/align-vertical-top.svg b/client/web/assets/16px-solid/align-top.svg similarity index 100% rename from client/web/assets/16px-solid/align-vertical-top.svg rename to client/web/assets/16px-solid/align-top.svg diff --git a/client/web/src/components/widgets/labels/IconLabel.vue b/client/web/src/components/widgets/labels/IconLabel.vue index a3ff7eecf..b828048c2 100644 --- a/client/web/src/components/widgets/labels/IconLabel.vue +++ b/client/web/src/components/widgets/labels/IconLabel.vue @@ -52,12 +52,12 @@ import VectorRectangleTool from "@/../assets/24px-two-tone/vector-rectangle-tool import VectorEllipseTool from "@/../assets/24px-two-tone/vector-ellipse-tool.svg"; import VectorShapeTool from "@/../assets/24px-two-tone/vector-shape-tool.svg"; -import AlignHorizontalLeft from "@/../assets/16px-solid/align-horizontal-left.svg"; +import AlignLeft from "@/../assets/16px-solid/align-left.svg"; import AlignHorizontalCenter from "@/../assets/16px-solid/align-horizontal-center.svg"; -import AlignHorizontalRight from "@/../assets/16px-solid/align-horizontal-right.svg"; -import AlignVerticalTop from "@/../assets/16px-solid/align-vertical-top.svg"; +import AlignRight from "@/../assets/16px-solid/align-right.svg"; +import AlignTop from "@/../assets/16px-solid/align-top.svg"; import AlignVerticalCenter from "@/../assets/16px-solid/align-vertical-center.svg"; -import AlignVerticalBottom from "@/../assets/16px-solid/align-vertical-bottom.svg"; +import AlignBottom from "@/../assets/16px-solid/align-bottom.svg"; import FlipHorizontal from "@/../assets/16px-solid/flip-horizontal.svg"; import FlipVertical from "@/../assets/16px-solid/flip-vertical.svg"; import BooleanUnion from "@/../assets/16px-solid/boolean-union.svg"; @@ -134,12 +134,12 @@ const icons = { VectorRectangleTool: { component: VectorRectangleTool, size: 24 }, VectorEllipseTool: { component: VectorEllipseTool, size: 24 }, VectorShapeTool: { component: VectorShapeTool, size: 24 }, - AlignHorizontalLeft: { component: AlignHorizontalLeft, size: 16 }, + AlignLeft: { component: AlignLeft, size: 16 }, AlignHorizontalCenter: { component: AlignHorizontalCenter, size: 16 }, - AlignHorizontalRight: { component: AlignHorizontalRight, size: 16 }, - AlignVerticalTop: { component: AlignVerticalTop, size: 16 }, + AlignRight: { component: AlignRight, size: 16 }, + AlignTop: { component: AlignTop, size: 16 }, AlignVerticalCenter: { component: AlignVerticalCenter, size: 16 }, - AlignVerticalBottom: { component: AlignVerticalBottom, size: 16 }, + AlignBottom: { component: AlignBottom, size: 16 }, FlipHorizontal: { component: FlipHorizontal, size: 16 }, FlipVertical: { component: FlipVertical, size: 16 }, BooleanUnion: { component: BooleanUnion, size: 16 }, diff --git a/client/web/src/components/widgets/options/ToolOptions.vue b/client/web/src/components/widgets/options/ToolOptions.vue index 468f34852..4bebe5d1a 100644 --- a/client/web/src/components/widgets/options/ToolOptions.vue +++ b/client/web/src/components/widgets/options/ToolOptions.vue @@ -87,15 +87,15 @@ export default defineComponent({ [ "Select", [ - { kind: "IconButton", icon: "AlignHorizontalLeft", title: "Horizontal Align Left" }, - { kind: "IconButton", icon: "AlignHorizontalCenter", title: "Horizontal Align Center" }, - { kind: "IconButton", icon: "AlignHorizontalRight", title: "Horizontal Align Right" }, + { kind: "IconButton", icon: "AlignLeft", title: "Align Left" }, + { kind: "IconButton", icon: "AlignHorizontalCenter", title: "Align Horizontal Center" }, + { kind: "IconButton", icon: "AlignRight", title: "Align Right" }, { kind: "Separator", type: SeparatorType.Unrelated }, - { kind: "IconButton", icon: "AlignVerticalTop", title: "Vertical Align Top" }, - { kind: "IconButton", icon: "AlignVerticalCenter", title: "Vertical Align Center" }, - { kind: "IconButton", icon: "AlignVerticalBottom", title: "Vertical Align Bottom" }, + { kind: "IconButton", icon: "AlignTop", title: "Align Top" }, + { kind: "IconButton", icon: "AlignVerticalCenter", title: "Align Vertical Center" }, + { kind: "IconButton", icon: "AlignBottom", title: "Align Bottom" }, { kind: "Separator", type: SeparatorType.Related },