diff --git a/packages/icons/icons/blockquote.svg b/packages/icons/icons/blockquote.svg index ce07afe39982..a17eedcd1f10 100644 --- a/packages/icons/icons/blockquote.svg +++ b/packages/icons/icons/blockquote.svg @@ -6,15 +6,8 @@ xmlns="http://www.w3.org/2000/svg" > - diff --git a/packages/icons/icons/content-embed.svg b/packages/icons/icons/content-embed.svg index ce830a576bac..1cc08e533ca9 100644 --- a/packages/icons/icons/content-embed.svg +++ b/packages/icons/icons/content-embed.svg @@ -24,19 +24,19 @@ stroke-linejoin="round" /> + + + + + + + diff --git a/packages/icons/icons/window-info.svg b/packages/icons/icons/window-info.svg new file mode 100644 index 000000000000..1c24d45b3b95 --- /dev/null +++ b/packages/icons/icons/window-info.svg @@ -0,0 +1,28 @@ + + + + + diff --git a/packages/icons/icons/window-title.svg b/packages/icons/icons/window-title.svg new file mode 100644 index 000000000000..cbd2387e4e98 --- /dev/null +++ b/packages/icons/icons/window-title.svg @@ -0,0 +1,20 @@ + + + + diff --git a/packages/icons/src/__generated__/components.tsx b/packages/icons/src/__generated__/components.tsx index d8cd5676ab4e..26f88bfb49af 100644 --- a/packages/icons/src/__generated__/components.tsx +++ b/packages/icons/src/__generated__/components.tsx @@ -957,10 +957,9 @@ export const BlockquoteIcon: IconComponent = forwardRef( ref={forwardedRef} > ); @@ -1764,13 +1763,13 @@ export const ContentEmbedIcon: IconComponent = forwardRef( stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" - d="M4.667 5.333h4M4.667 8H10M14 8.75V3.5A1.5 1.5 0 0 0 12.5 2h-9A1.5 1.5 0 0 0 2 3.5v9.252c0 .69.56 1.25 1.25 1.25v0H6M12.817 13.698 14 12.515l-1.183-1.182" + d="M4.667 5.333h4M4.667 8H10M14 8.75V3.5A1.5 1.5 0 0 0 12.5 2h-9A1.5 1.5 0 0 0 2 3.5v9.252c0 .69.56 1.25 1.25 1.25v0H6M13.686 14.265l1.4-1.4-1.4-1.4" /> ); @@ -3141,7 +3140,7 @@ export const MarkdownEmbedIcon: IconComponent = forwardRef( stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" - d="M11 14.314v-3l1.5 1.523 1.5-1.523v3" + d="M10 14.314v-4l2 2.03 2-2.03v4" /> ); @@ -3970,6 +3969,36 @@ export const ResetIcon: IconComponent = forwardRef( ); ResetIcon.displayName = "ResetIcon"; +export const ResourceIcon: IconComponent = forwardRef( + ({ fill = "none", size = 16, ...props }, forwardedRef) => { + return ( + + + + + ); + } +); +ResourceIcon.displayName = "ResourceIcon"; + export const ScrollIcon: IconComponent = forwardRef( ({ fill = "none", size = 16, ...props }, forwardedRef) => { return ( @@ -5414,6 +5443,62 @@ export const WebstudioIcon: IconComponent = forwardRef( ); WebstudioIcon.displayName = "WebstudioIcon"; +export const WindowInfoIcon: IconComponent = forwardRef( + ({ fill = "none", size = 16, ...props }, forwardedRef) => { + return ( + + + + + ); + } +); +WindowInfoIcon.displayName = "WindowInfoIcon"; + +export const WindowTitleIcon: IconComponent = forwardRef( + ({ fill = "none", size = 16, ...props }, forwardedRef) => { + return ( + + + + ); + } +); +WindowTitleIcon.displayName = "WindowTitleIcon"; + export const WrapIcon: IconComponent = forwardRef( ({ fill = "none", size = 16, ...props }, forwardedRef) => { return ( diff --git a/packages/icons/src/__generated__/svg.ts b/packages/icons/src/__generated__/svg.ts index 9a5e6d3b62e3..aaa726d1461e 100644 --- a/packages/icons/src/__generated__/svg.ts +++ b/packages/icons/src/__generated__/svg.ts @@ -66,7 +66,7 @@ export const AttachmentIcon = ``; -export const BlockquoteIcon = ``; +export const BlockquoteIcon = ``; export const BodyIcon = ``; @@ -130,7 +130,7 @@ export const CommitIcon = ``; -export const ContentEmbedIcon = ``; +export const ContentEmbedIcon = ``; export const ContentIcon = ``; @@ -230,7 +230,7 @@ export const ListIcon = ``; -export const MarkdownEmbedIcon = ``; +export const MarkdownEmbedIcon = ``; export const MaximizeIcon = ``; @@ -294,6 +294,8 @@ export const RepeatRowIcon = ``; +export const ResourceIcon = ``; + export const ScrollIcon = ``; export const SearchIcon = ``; @@ -376,6 +378,10 @@ export const Webstudio1cIcon = ``; +export const WindowInfoIcon = ``; + +export const WindowTitleIcon = ``; + export const WrapIcon = ``; export const XAxisRotateIcon = ``; diff --git a/packages/sdk-components-react/src/code-text.ws.ts b/packages/sdk-components-react/src/code-text.ws.ts index f9fc2b584193..2639ef19d10a 100644 --- a/packages/sdk-components-react/src/code-text.ws.ts +++ b/packages/sdk-components-react/src/code-text.ws.ts @@ -51,7 +51,7 @@ export const meta: WsComponentMeta = { }, states: defaultStates, presetStyle, - order: 9, + order: 5, }; export const propsMeta: WsComponentPropsMeta = { diff --git a/packages/sdk-components-react/src/head-link.ws.ts b/packages/sdk-components-react/src/head-link.ws.ts index abdf5d56afeb..9a576a90e950 100644 --- a/packages/sdk-components-react/src/head-link.ws.ts +++ b/packages/sdk-components-react/src/head-link.ws.ts @@ -1,4 +1,4 @@ -import { Link2Icon } from "@webstudio-is/icons/svg"; +import { ResourceIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, type WsComponentPropsMeta, @@ -8,7 +8,7 @@ import { props } from "./__generated__/head-link.props"; export const meta: WsComponentMeta = { category: "hidden", - icon: Link2Icon, + icon: ResourceIcon, type: "container", stylable: false, constraints: { diff --git a/packages/sdk-components-react/src/head-meta.ws.ts b/packages/sdk-components-react/src/head-meta.ws.ts index 80ad828409f5..5879fa5027a7 100644 --- a/packages/sdk-components-react/src/head-meta.ws.ts +++ b/packages/sdk-components-react/src/head-meta.ws.ts @@ -1,4 +1,4 @@ -import { Link2Icon } from "@webstudio-is/icons/svg"; +import { WindowInfoIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, type WsComponentPropsMeta, @@ -8,7 +8,7 @@ import { props } from "./__generated__/head-meta.props"; export const meta: WsComponentMeta = { category: "hidden", - icon: Link2Icon, + icon: WindowInfoIcon, type: "container", stylable: false, constraints: { diff --git a/packages/sdk-components-react/src/head-slot.template.tsx b/packages/sdk-components-react/src/head-slot.template.tsx index 99260fa9ae24..f035205c5ff2 100644 --- a/packages/sdk-components-react/src/head-slot.template.tsx +++ b/packages/sdk-components-react/src/head-slot.template.tsx @@ -2,8 +2,9 @@ import { type TemplateMeta, $ } from "@webstudio-is/template"; export const meta: TemplateMeta = { category: "general", - description: "Head", - order: 4, + description: + "The Head Slot component lets you customize page-specific head elements (like canonical URLs), which merge with your site's global head settings, with Head Slot definitions taking priority over Page Settings. For site-wide head changes, use Project Settings instead.", + order: 6, template: ( <$.HeadSlot> <$.HeadTitle ws:label="Title">Title diff --git a/packages/sdk-components-react/src/head-title.ws.ts b/packages/sdk-components-react/src/head-title.ws.ts index 966309579528..0a42cbd05d96 100644 --- a/packages/sdk-components-react/src/head-title.ws.ts +++ b/packages/sdk-components-react/src/head-title.ws.ts @@ -1,4 +1,4 @@ -import { Link2Icon } from "@webstudio-is/icons/svg"; +import { WindowTitleIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, type WsComponentPropsMeta, @@ -8,7 +8,7 @@ import { props } from "./__generated__/head-title.props"; export const meta: WsComponentMeta = { category: "hidden", - icon: Link2Icon, + icon: WindowTitleIcon, type: "container", stylable: false, constraints: { diff --git a/packages/sdk-components-react/src/html-embed.ws.ts b/packages/sdk-components-react/src/html-embed.ws.ts index bdc56a9bac24..40c2527eadbf 100644 --- a/packages/sdk-components-react/src/html-embed.ws.ts +++ b/packages/sdk-components-react/src/html-embed.ws.ts @@ -26,7 +26,7 @@ export const meta: WsComponentMeta = { description: "Used to add HTML code to the page, such as an SVG or script.", icon: EmbedIcon, presetStyle, - order: 8, + order: 2, }; export const propsMeta: WsComponentPropsMeta = { diff --git a/packages/sdk-components-react/src/separator.ws.ts b/packages/sdk-components-react/src/separator.ws.ts index bb6a120b490a..c3d1d45aa49c 100644 --- a/packages/sdk-components-react/src/separator.ws.ts +++ b/packages/sdk-components-react/src/separator.ws.ts @@ -48,7 +48,7 @@ export const meta: WsComponentMeta = { icon: MinusIcon, states: defaultStates, presetStyle, - order: 5, + order: 3, }; export const propsMeta: WsComponentPropsMeta = { diff --git a/packages/sdk-components-react/src/slot.ws.ts b/packages/sdk-components-react/src/slot.ws.ts index 0e6a0946ecac..099256f7adfd 100644 --- a/packages/sdk-components-react/src/slot.ws.ts +++ b/packages/sdk-components-react/src/slot.ws.ts @@ -8,7 +8,7 @@ export const meta: WsComponentMeta = { "Slot is a container for content that you want to reference across the project. Changes made to a Slot's children will be reflected in all other instances of that Slot.", icon: SlotComponentIcon, stylable: false, - order: 6, + order: 5, }; export const propsMeta: WsComponentPropsMeta = {