diff --git a/images/icons/v2/crop-lock-24.svg b/images/icons/v2/crop-lock-24.svg
deleted file mode 100644
index b0502a105..000000000
--- a/images/icons/v2/crop-lock-24.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/crop-unlock-24.svg b/images/icons/v2/crop-unlock-24.svg
deleted file mode 100644
index 6c08707f5..000000000
--- a/images/icons/v2/crop-unlock-24.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/font-bold.svg b/images/icons/v2/font-bold.svg
deleted file mode 100644
index 4c836b0a1..000000000
--- a/images/icons/v2/font-bold.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/font-condensed.svg b/images/icons/v2/font-condensed.svg
deleted file mode 100644
index cb5118d8e..000000000
--- a/images/icons/v2/font-condensed.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/font-regular.svg b/images/icons/v2/font-regular.svg
deleted file mode 100644
index 2ecbefb63..000000000
--- a/images/icons/v2/font-regular.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/font-script.svg b/images/icons/v2/font-script.svg
deleted file mode 100644
index c015bd6e2..000000000
--- a/images/icons/v2/font-script.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/font-serif.svg b/images/icons/v2/font-serif.svg
deleted file mode 100644
index 5d2c9d962..000000000
--- a/images/icons/v2/font-serif.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/merge-16.svg b/images/icons/v2/merge-16.svg
deleted file mode 100644
index 35e7496d4..000000000
--- a/images/icons/v2/merge-16.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-20.svg b/images/icons/v2/pen-20.svg
deleted file mode 100644
index 0a184fd4a..000000000
--- a/images/icons/v2/pen-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-heavy-20.svg b/images/icons/v2/pen-heavy-20.svg
deleted file mode 100644
index f1bb57dda..000000000
--- a/images/icons/v2/pen-heavy-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-highlighter-20.svg b/images/icons/v2/pen-highlighter-20.svg
deleted file mode 100644
index 646605821..000000000
--- a/images/icons/v2/pen-highlighter-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-light-20.svg b/images/icons/v2/pen-light-20.svg
deleted file mode 100644
index e103b3c25..000000000
--- a/images/icons/v2/pen-light-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-medium-20.svg b/images/icons/v2/pen-medium-20.svg
deleted file mode 100644
index e75ed1583..000000000
--- a/images/icons/v2/pen-medium-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/pen-regular-20.svg b/images/icons/v2/pen-regular-20.svg
deleted file mode 100644
index ab289df4c..000000000
--- a/images/icons/v2/pen-regular-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/signal-connections.svg b/images/icons/v2/signal-connections.svg
deleted file mode 100644
index 8be8cef95..000000000
--- a/images/icons/v2/signal-connections.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/text-highlight-20.svg b/images/icons/v2/text-highlight-20.svg
deleted file mode 100644
index b1012a114..000000000
--- a/images/icons/v2/text-highlight-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/text-outline-20.svg b/images/icons/v2/text-outline-20.svg
deleted file mode 100644
index 4ab50f8ce..000000000
--- a/images/icons/v2/text-outline-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v2/text-regular-20.svg b/images/icons/v2/text-regular-20.svg
deleted file mode 100644
index dfc8f9ba1..000000000
--- a/images/icons/v2/text-regular-20.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v3/brush/brush-highlighter-compact.svg b/images/icons/v3/brush/brush-highlighter-compact.svg
new file mode 100644
index 000000000..bb9296ae1
--- /dev/null
+++ b/images/icons/v3/brush/brush-highlighter-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/brush/brush-pen-compact.svg b/images/icons/v3/brush/brush-pen-compact.svg
new file mode 100644
index 000000000..99b7adc12
--- /dev/null
+++ b/images/icons/v3/brush/brush-pen-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/brush_size/brush_size-heavy-compact.svg b/images/icons/v3/brush_size/brush_size-heavy-compact.svg
new file mode 100644
index 000000000..331077421
--- /dev/null
+++ b/images/icons/v3/brush_size/brush_size-heavy-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/brush_size/brush_size-medium-compact.svg b/images/icons/v3/brush_size/brush_size-medium-compact.svg
new file mode 100644
index 000000000..34c811b2b
--- /dev/null
+++ b/images/icons/v3/brush_size/brush_size-medium-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/brush_size/brush_size-regular-compact.svg b/images/icons/v3/brush_size/brush_size-regular-compact.svg
new file mode 100644
index 000000000..929ce1eb4
--- /dev/null
+++ b/images/icons/v3/brush_size/brush_size-regular-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/brush_size/brush_size-thin-compact.svg b/images/icons/v3/brush_size/brush_size-thin-compact.svg
new file mode 100644
index 000000000..6b94a8468
--- /dev/null
+++ b/images/icons/v3/brush_size/brush_size-thin-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/connections/connections-display.svg b/images/icons/v3/connections/connections-display.svg
new file mode 100644
index 000000000..9a8471859
--- /dev/null
+++ b/images/icons/v3/connections/connections-display.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/crop/crop-lock.svg b/images/icons/v3/crop/crop-lock.svg
new file mode 100644
index 000000000..ee6c9e249
--- /dev/null
+++ b/images/icons/v3/crop/crop-lock.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/crop/crop-unlock.svg b/images/icons/v3/crop/crop-unlock.svg
new file mode 100644
index 000000000..0d4183701
--- /dev/null
+++ b/images/icons/v3/crop/crop-unlock.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/font/font-bold-compact.svg b/images/icons/v3/font/font-bold-compact.svg
new file mode 100644
index 000000000..999ce8f0a
--- /dev/null
+++ b/images/icons/v3/font/font-bold-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/font/font-condensed-compact.svg b/images/icons/v3/font/font-condensed-compact.svg
new file mode 100644
index 000000000..c76a30f6a
--- /dev/null
+++ b/images/icons/v3/font/font-condensed-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/font/font-regular-compact.svg b/images/icons/v3/font/font-regular-compact.svg
new file mode 100644
index 000000000..0eef8f418
--- /dev/null
+++ b/images/icons/v3/font/font-regular-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/font/font-script-compact.svg b/images/icons/v3/font/font-script-compact.svg
new file mode 100644
index 000000000..2b30a043a
--- /dev/null
+++ b/images/icons/v3/font/font-script-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/font/font-serif-compact.svg b/images/icons/v3/font/font-serif-compact.svg
new file mode 100644
index 000000000..c598fae34
--- /dev/null
+++ b/images/icons/v3/font/font-serif-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/maximize/maximize-square-light.svg b/images/icons/v3/maximize/maximize-square-light.svg
deleted file mode 100644
index cc723450f..000000000
--- a/images/icons/v3/maximize/maximize-square-light.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/images/icons/v3/merge/merge-compact.svg b/images/icons/v3/merge/merge-compact.svg
new file mode 100644
index 000000000..d3df143c2
--- /dev/null
+++ b/images/icons/v3/merge/merge-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/pip/pip-maximize-light.svg b/images/icons/v3/pip/pip-maximize-light.svg
new file mode 100644
index 000000000..13b034541
--- /dev/null
+++ b/images/icons/v3/pip/pip-maximize-light.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/text/text-outline-compact.svg b/images/icons/v3/text/text-outline-compact.svg
new file mode 100644
index 000000000..28d802048
--- /dev/null
+++ b/images/icons/v3/text/text-outline-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/text/text-square-compact.svg b/images/icons/v3/text/text-square-compact.svg
new file mode 100644
index 000000000..5ba76885e
--- /dev/null
+++ b/images/icons/v3/text/text-square-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/text/text-square-fill-compact.svg b/images/icons/v3/text/text-square-fill-compact.svg
new file mode 100644
index 000000000..1da6cd575
--- /dev/null
+++ b/images/icons/v3/text/text-square-fill-compact.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 2d908402e..f7dc7a520 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -4172,7 +4172,7 @@ button.module-image__border-overlay:focus {
&--pip {
@include color-svg(
- '../images/icons/v3/maximize/maximize-square-light.svg',
+ '../images/icons/v3/pip/pip-maximize-light.svg',
$color-gray-75
);
height: 24px;
@@ -4180,7 +4180,7 @@ button.module-image__border-overlay:focus {
border: none;
@include dark-theme {
@include color-svg(
- '../images/icons/v3/maximize/maximize-square-light.svg',
+ '../images/icons/v3/pip/pip-maximize-light.svg',
$color-gray-15
);
}
diff --git a/stylesheets/components/MediaEditor.scss b/stylesheets/components/MediaEditor.scss
index ea0102a33..8a7b3e77a 100644
--- a/stylesheets/components/MediaEditor.scss
+++ b/stylesheets/components/MediaEditor.scss
@@ -187,7 +187,7 @@
&__button {
@mixin icon($icon) {
- @include color-svg('../images/icons/v2/#{$icon}', $color-white);
+ @include color-svg('../images/icons/#{$icon}', $color-white);
opacity: 1;
height: 20px;
width: 20px;
@@ -212,94 +212,109 @@
}
&--draw-pen__button {
- @include icon('pen-20.svg');
+ @include icon('v3/brush/brush-pen-compact.svg');
}
&--draw-highlighter__button {
- @include icon('pen-highlighter-20.svg');
+ @include icon('v3/brush/brush-highlighter-compact.svg');
}
&--width-thin__button {
- @include icon('pen-light-20.svg');
+ @include icon('v3/brush_size/brush_size-thin-compact.svg');
}
&--width-regular__button {
- @include icon('pen-regular-20.svg');
+ @include icon('v3/brush_size/brush_size-regular-compact.svg');
}
&--width-medium__button {
- @include icon('pen-medium-20.svg');
+ @include icon('v3/brush_size/brush_size-medium-compact.svg');
}
&--width-heavy__button {
- @include icon('pen-heavy-20.svg');
+ @include icon('v3/brush_size/brush_size-heavy-compact.svg');
}
&--text-regular__button {
- @include icon('text-regular-20.svg');
+ @include icon('v3/text/text-square-compact.svg');
}
&--text-highlight__button {
- @include icon('text-highlight-20.svg');
+ @include icon('v3/text/text-square-fill-compact.svg');
}
&--text-outline__button {
- @include icon('text-outline-20.svg');
+ @include icon('v3/text/text-outline-compact.svg');
}
&--rotate {
- @include icon('rotate-outline-24.svg');
+ @include icon('v2/rotate-outline-24.svg');
}
&--flip {
- @include icon('flip-outline-24.svg');
+ @include icon('v2/flip-outline-24.svg');
}
&--crop-locked {
- @include icon('crop-lock-24.svg');
+ @include icon('v3/crop/crop-lock.svg');
}
&--crop-unlocked {
- @include icon('crop-unlock-24.svg');
+ @include icon('v3/crop/crop-unlock.svg');
}
}
}
&__icon {
&--draw-pen {
- @include color-svg('../images/icons/v2/pen-20.svg', $color-white);
+ @include color-svg(
+ '../images/icons/v3/brush/brush-pen-compact.svg',
+ $color-white
+ );
}
&--draw-highlighter {
@include color-svg(
- '../images/icons/v2/pen-highlighter-20.svg',
+ '../images/icons/v3/brush/brush-highlighter-compact.svg',
$color-white
);
}
&--text-regular {
@include color-svg(
- '../images/icons/v2/text-regular-20.svg',
+ '../images/icons/v3/text/text-square-compact.svg',
$color-white
);
}
&--text-highlight {
@include color-svg(
- '../images/icons/v2/text-highlight-20.svg',
+ '../images/icons/v3/text/text-square-fill-compact.svg',
$color-white
);
}
&--text-outline {
@include color-svg(
- '../images/icons/v2/text-outline-20.svg',
+ '../images/icons/v3/text/text-outline-compact.svg',
$color-white
);
}
&--width-thin {
- @include color-svg('../images/icons/v2/pen-light-20.svg', $color-white);
+ @include color-svg(
+ '../images/icons/v3/brush_size/brush_size-thin-compact.svg',
+ $color-white
+ );
}
&--width-regular {
- @include color-svg('../images/icons/v2/pen-regular-20.svg', $color-white);
+ @include color-svg(
+ '../images/icons/v3/brush_size/brush_size-regular-compact.svg',
+ $color-white
+ );
}
&--width-medium {
- @include color-svg('../images/icons/v2/pen-medium-20.svg', $color-white);
+ @include color-svg(
+ '../images/icons/v3/brush_size/brush_size-medium-compact.svg',
+ $color-white
+ );
}
&--width-heavy {
- @include color-svg('../images/icons/v2/pen-heavy-20.svg', $color-white);
+ @include color-svg(
+ '../images/icons/v3/brush_size/brush_size-heavy-compact.svg',
+ $color-white
+ );
}
}
}
diff --git a/stylesheets/components/SignalConnectionsModal.scss b/stylesheets/components/SignalConnectionsModal.scss
index 12737d5d2..328e01e7d 100644
--- a/stylesheets/components/SignalConnectionsModal.scss
+++ b/stylesheets/components/SignalConnectionsModal.scss
@@ -4,7 +4,7 @@
.SignalConnectionsModal {
&__icon {
@include color-svg(
- '../images/icons/v2/signal-connections.svg',
+ '../images/icons/v3/connections/connections-display.svg',
$color-ultramarine-light
);
display: block;
diff --git a/stylesheets/components/StoryCreator.scss b/stylesheets/components/StoryCreator.scss
index 71894bbdb..92c8f998b 100644
--- a/stylesheets/components/StoryCreator.scss
+++ b/stylesheets/components/StoryCreator.scss
@@ -5,7 +5,7 @@
$tools-height: 44px;
@mixin svg($icon) {
- @include color-svg('../images/icons/v2/#{$icon}', $color-white);
+ @include color-svg('../images/icons/#{$icon}', $color-white);
}
background: $color-gray-95;
@@ -165,47 +165,47 @@
padding: 8px;
&--bg {
- @include icon('text-effect-on-24.svg');
+ @include icon('v2/text-effect-on-24.svg');
}
&--bg-inverse {
- @include icon('text-effect-on-24.svg');
+ @include icon('v2/text-effect-on-24.svg');
}
&--bg-none {
- @include icon('text-effect-off-24.svg');
+ @include icon('v2/text-effect-off-24.svg');
}
&--font-regular__button {
- @include icon('font-regular.svg');
+ @include icon('v3/font/font-regular-compact.svg');
}
&--font-bold__button {
- @include icon('font-bold.svg');
+ @include icon('v3/font/font-bold-compact.svg');
}
&--font-serif__button {
- @include icon('font-serif.svg');
+ @include icon('v3/font/font-serif-compact.svg');
}
&--font-script__button {
- @include icon('font-script.svg');
+ @include icon('v3/font/font-script-compact.svg');
}
&--font-condensed__button {
- @include icon('font-condensed.svg');
+ @include icon('v3/font/font-condensed-compact.svg');
}
}
}
&__icon {
&--font-regular {
- @include svg('font-regular.svg');
+ @include svg('v3/font/font-regular-compact.svg');
}
&--font-bold {
- @include svg('font-bold.svg');
+ @include svg('v3/font/font-bold-compact.svg');
}
&--font-serif {
- @include svg('font-serif.svg');
+ @include svg('v3/font/font-serif-compact.svg');
}
&--font-script {
- @include svg('font-script.svg');
+ @include svg('v3/font/font-script-compact.svg');
}
&--font-condensed {
- @include svg('font-condensed.svg');
+ @include svg('v3/font/font-condensed-compact.svg');
}
}
diff --git a/stylesheets/components/SystemMessage.scss b/stylesheets/components/SystemMessage.scss
index d114bcf26..875d04461 100644
--- a/stylesheets/components/SystemMessage.scss
+++ b/stylesheets/components/SystemMessage.scss
@@ -278,8 +278,8 @@
&--icon-merge::before {
@include system-message-icon(
- '../images/icons/v2/merge-16.svg',
- '../images/icons/v2/merge-16.svg'
+ '../images/icons/v3/merge/merge-compact.svg',
+ '../images/icons/v3/merge/merge-compact.svg'
);
}
}
diff --git a/ts/components/conversation/TimelineItem.stories.tsx b/ts/components/conversation/TimelineItem.stories.tsx
index f3003bad1..a6ee3a296 100644
--- a/ts/components/conversation/TimelineItem.stories.tsx
+++ b/ts/components/conversation/TimelineItem.stories.tsx
@@ -545,6 +545,14 @@ export function Notification(): JSX.Element {
contact: getDefaultConversation(),
},
},
+ {
+ type: 'conversationMerge',
+ data: {
+ conversationTitle: 'Alice',
+ obsoleteConversationTitle: 'Nancy',
+ obsoleteConversationNumber: '+121255501234',
+ },
+ },
];
return (