From d5e05011db51f795cc4fa2a7339a5a3be2f92b4f Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Wed, 7 Jun 2023 19:17:29 +0300
Subject: [PATCH] UBER-421: Fixed attachment/comment icons (#3392)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/_layouts.scss                       | 2 +-
 packages/ui/src/components/icons/Attachment.svelte        | 4 ++--
 packages/ui/src/components/icons/Thread.svelte            | 6 ++++--
 .../src/components/CommentsPresenter.svelte               | 8 ++++----
 .../src/components/issues/edit/SubIssuesSelector.svelte   | 4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index b9b67d8831..66556b7601 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -440,7 +440,7 @@ input.search {
   cursor: pointer;
 
   .icon {
-    margin-right: .25rem;
+    margin-right: .375rem;
     color: var(--theme-content-color);
     &.small-size {
       width: 1.5rem;
diff --git a/packages/ui/src/components/icons/Attachment.svelte b/packages/ui/src/components/icons/Attachment.svelte
index d1479587ee..a5e044665d 100644
--- a/packages/ui/src/components/icons/Attachment.svelte
+++ b/packages/ui/src/components/icons/Attachment.svelte
@@ -20,10 +20,10 @@
   export let fill: string = 'currentColor'
 </script>
 
-<svg class="svg-{size}" {fill} viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<svg class="svg-{size}" {fill} viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
   <path
     fill-rule="evenodd"
     clip-rule="evenodd"
-    d="M26.682 5.31802C24.9246 3.56066 22.0754 3.56066 20.318 5.31802L5.31802 20.318C3.56066 22.0754 3.56066 24.9246 5.31802 26.682C7.07538 28.4393 9.92462 28.4393 11.682 26.682L11.6875 26.6765L14.1575 24.282C14.5541 23.8976 15.1871 23.9074 15.5716 24.304C15.956 24.7005 15.9461 25.3336 15.5496 25.718L13.0905 28.1019C10.5516 30.6346 6.44031 30.6327 3.90381 28.0962C1.3654 25.5578 1.3654 21.4422 3.90381 18.9038L18.9038 3.90381C21.4422 1.3654 25.5578 1.3654 28.0962 3.90381C30.6346 6.44221 30.6346 10.5578 28.0962 13.0962L20.5104 20.682C18.753 22.4393 15.9038 22.4393 14.1464 20.682C12.3891 18.9246 12.3891 16.0754 14.1464 14.318L17.7929 10.6716C18.1834 10.281 18.8166 10.281 19.2071 10.6716C19.5976 11.0621 19.5976 11.6953 19.2071 12.0858L15.5607 15.7322C14.5843 16.7085 14.5843 18.2915 15.5607 19.2678C16.537 20.2441 18.1199 20.2441 19.0962 19.2678L26.682 11.682C28.4393 9.92462 28.4393 7.07538 26.682 5.31802Z"
+    d="M12.9142 2.58576C12.1378 1.80936 10.8893 1.8178 10.1035 2.60352L3.8535 8.85351C2.68656 10.0205 2.70242 11.9451 3.87865 13.1213C5.05488 14.2975 6.97945 14.3134 8.1464 13.1464L11.1463 10.1465C11.3416 9.95119 11.6582 9.95119 11.8535 10.1465C12.0487 10.3417 12.0487 10.6583 11.8535 10.8536L8.85351 13.8535C7.28679 15.4202 4.72899 15.3858 3.17154 13.8284C1.61411 12.271 1.57967 9.71313 3.1464 8.1464L9.39642 1.89642C10.5633 0.729518 12.4451 0.702443 13.6213 1.87866C14.7975 3.05488 14.7704 4.93673 13.6035 6.10362L7.35245 12.3547C6.59335 13.1138 5.36185 13.1928 4.58451 12.4154C3.80823 11.6392 3.88608 10.4103 4.64203 9.65096L8.01763 6.154C8.20942 5.95532 8.52595 5.94973 8.72463 6.14152C8.92331 6.3333 8.9289 6.64983 8.73711 6.84851L5.35557 10.3516L5.35245 10.3548C4.93991 10.7673 4.94735 11.3641 5.29161 11.7083C5.63594 12.0527 6.23287 12.0601 6.64534 11.6476L12.8964 5.39651C13.6821 4.61079 13.6906 3.36217 12.9142 2.58576Z"
   />
 </svg>
diff --git a/packages/ui/src/components/icons/Thread.svelte b/packages/ui/src/components/icons/Thread.svelte
index 4783ec0aa9..bd52bef4f1 100644
--- a/packages/ui/src/components/icons/Thread.svelte
+++ b/packages/ui/src/components/icons/Thread.svelte
@@ -20,8 +20,10 @@
   const fill: string = 'currentColor'
 </script>
 
-<svg class="svg-{size}" {fill} viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<svg class="svg-{size}" {fill} viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
   <path
-    d="M8,14.5c-0.9,0-1.9-0.2-2.7-0.6c-0.2-0.1-0.5-0.2-0.6-0.2c-0.2,0-0.4,0.1-0.7,0.2c-0.5,0.2-1.2,0.4-1.7-0.1 c-0.5-0.5-0.3-1.2-0.1-1.7c0.1-0.3,0.2-0.5,0.2-0.7c0-0.2-0.1-0.4-0.2-0.7C1,8.3,1.5,5.3,3.4,3.4C4.6,2.2,6.3,1.5,8,1.5 s3.4,0.7,4.6,1.9c2.5,2.5,2.5,6.7,0,9.2l0,0C11.4,13.8,9.7,14.5,8,14.5z M4.6,12.7c0.4,0,0.7,0.1,1,0.3c2.1,1,4.6,0.5,6.2-1.1 c2.1-2.1,2.1-5.6,0-7.8c-1-1-2.4-1.6-3.9-1.6c-1.5,0-2.9,0.6-3.9,1.6C2.5,5.7,2,8.2,3,10.3c0.1,0.4,0.3,0.7,0.3,1.1 c0,0.4-0.1,0.7-0.2,1C3,12.6,2.9,13,2.9,13.1C3,13.2,3.4,13,3.6,12.9C3.9,12.8,4.3,12.7,4.6,12.7z M12.2,12.2L12.2,12.2L12.2,12.2z"
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M16 6C9.20948 6 4 10.6272 4 16C4 18.1619 4.82539 20.1782 6.25857 21.8353C6.48585 22.0981 6.56044 22.46 6.45559 22.7913C6.11025 23.8822 5.59859 24.9049 4.96437 25.8562C6.36749 25.6496 7.72455 25.2236 8.98685 24.5982C9.26684 24.4595 9.59558 24.4596 9.87546 24.5986C11.6632 25.4861 13.7558 26 16 26C22.7905 26 28 21.3728 28 16C28 10.6272 22.7905 6 16 6ZM2 16C2 9.2225 8.43112 4 16 4C23.5689 4 30 9.2225 30 16C30 22.7775 23.5689 28 16 28C13.6319 28 11.3944 27.4963 9.43078 26.6016C7.4311 27.5144 5.24057 28 3 28C2.63121 28 2.29235 27.797 2.11833 27.4719C1.94431 27.1467 1.96338 26.7522 2.16795 26.4453L3.37487 24.6349C3.78033 24.0267 4.11535 23.3749 4.37375 22.692C2.88402 20.7925 2 18.4911 2 16Z"
   />
 </svg>
diff --git a/plugins/chunter-resources/src/components/CommentsPresenter.svelte b/plugins/chunter-resources/src/components/CommentsPresenter.svelte
index d74163549e..d16f2f8f40 100644
--- a/plugins/chunter-resources/src/components/CommentsPresenter.svelte
+++ b/plugins/chunter-resources/src/components/CommentsPresenter.svelte
@@ -27,7 +27,7 @@
   export let withInput: boolean = true
 </script>
 
-{#if (value && value > 0) || withInput}
+{#if value && value > 0}
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   <DocNavLink {object} inline noUnderline={true}>
     {#if kind === 'list'}
@@ -40,9 +40,9 @@
       >
         <Button {kind} {size}>
           <div slot="content" class="flex-row-center">
-            <span class="icon"><IconThread size={'x-small'} /></span>
+            <span class="icon"><IconThread size={'small'} /></span>
             {#if showCounter}
-              &nbsp;{value ?? 0}
+              {value ?? 0}
             {/if}
           </div>
         </Button>
@@ -57,7 +57,7 @@
       >
         <span class="icon"><IconThread {size} /></span>
         {#if showCounter && value && value !== 0}
-          &nbsp;{value}
+          {value}
         {/if}
       </div>
     {/if}
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
index 34a0617ad1..4dafdebc78 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssuesSelector.svelte
@@ -150,8 +150,8 @@
       <svelte:fragment slot="content">
         {#if subIssues}
           <div class="flex-row-center content-color text-sm pointer-events-none">
-            <div class="mr-1">
-              <ProgressCircle bind:value={countComplete} bind:max={subIssues.length} size={'inline'} primary />
+            <div class="mr-1-5">
+              <ProgressCircle bind:value={countComplete} bind:max={subIssues.length} size={'small'} primary />
             </div>
             {countComplete}/{subIssues.length}
           </div>