From 25eb047538d4ac90eedbac8822fc87a0f9852a11 Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Wed, 1 Sep 2021 22:08:07 +0300
Subject: [PATCH] Social links. Fix Email icon (#121)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 plugins/contact-assets/assets/icons.svg           |  3 +--
 .../src/components/ChannelsPresenter.svelte       | 15 ++++++++++++---
 .../src/components/DialogHeader.svelte            |  8 +++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/contact-assets/assets/icons.svg b/plugins/contact-assets/assets/icons.svg
index fa57de0f4a..98f077a9df 100644
--- a/plugins/contact-assets/assets/icons.svg
+++ b/plugins/contact-assets/assets/icons.svg
@@ -3,8 +3,7 @@
     <path d="M12,9.4l1.3,1.3c0.3,0.3,0.3,0.7,0,1c-1.5,1.5-3.9,1.7-5.6,0.4l-0.1-0.1c-1.3-1-2.4-2.1-3.4-3.4L4,8.6 C2.8,6.8,2.9,4.4,4.4,2.9c0.3-0.3,0.7-0.3,1,0l1.3,1.3c0.4,0.4,0.4,1,0,1.4L5.9,6.5C5.7,6.7,5.7,7,5.8,7.2C6.5,8.6,7.6,9.7,9,10.4 c0.2,0.1,0.5,0.1,0.7-0.1l0.9-0.9C11,9,11.6,9,12,9.4z"/>
   </symbol>
   <symbol id="email" viewBox="0 0 16 16">
-    <path d="M2.8,4.1C2.5,4.4,2.5,4.9,2.5,5.8v4.6c0,0.9,0,1.4,0.3,1.7c0.3,0.3,0.8,0.3,1.7,0.3h7c0.9,0,1.4,0,1.7-0.3 c0.3-0.3,0.3-0.8,0.3-1.7V5.8c0-0.9,0-1.4-0.3-1.7c-0.3-0.3-0.8-0.3-1.7-0.3h-7C3.6,3.8,3.1,3.8,2.8,4.1z M4.6,5.8 C4.4,5.7,4.1,5.7,3.9,6C3.8,6.2,3.8,6.5,4.1,6.7l3.1,2.1c0.5,0.3,1.2,0.3,1.7,0l3.1-2.1c0.2-0.2,0.3-0.5,0.1-0.7 c-0.2-0.2-0.5-0.3-0.7-0.1L8.3,7.9C8.1,8,7.9,8,7.7,7.9L4.6,5.8z"/>
-  </symbol>
+    <path d="M2.8 4.1c-.3.3-.3.8-.3 1.7v4.6c0 .9 0 1.4.3 1.7.3.3.8.3 1.7.3h7c.9 0 1.4 0 1.7-.3.3-.3.3-.8.3-1.7V5.8c0-.9 0-1.4-.3-1.7-.3-.3-.8-.3-1.7-.3h-7c-.9 0-1.4 0-1.7.3zm1.8 1.7c-.2-.1-.5-.1-.7.2-.1.2-.1.5.2.7l3.1 2.1c.5.3 1.2.3 1.7 0L12 6.7c.2-.2.3-.5.1-.7-.2-.2-.5-.3-.7-.1l-3.1 2c-.2.1-.4.1-.6 0L4.6 5.8z" fill-rule="evenodd" clip-rule="evenodd"/>  </symbol>
   <symbol id="discord" viewBox="0 0 16 16">
     <path d="M12.2,4.7C11.4,4.4,10.6,4.1,9.7,4C9.6,4.2,9.5,4.4,9.4,4.6c-0.9-0.1-1.8-0.1-2.7,0C6.5,4.4,6.4,4.2,6.3,4 C5.4,4.1,4.6,4.4,3.8,4.7c-1.6,2.2-2,4.4-1.8,6.5c1,0.7,2,1.2,3,1.5c0.2-0.3,0.5-0.7,0.7-1c-0.4-0.1-0.7-0.3-1-0.5 c0.1-0.1,0.2-0.1,0.3-0.2c2,0.9,4.1,0.9,6.1,0c0.1,0.1,0.2,0.1,0.3,0.2c-0.3,0.2-0.7,0.3-1,0.5c0.2,0.4,0.4,0.7,0.7,1 c1-0.3,2-0.7,3-1.5C14.2,8.8,13.5,6.6,12.2,4.7z M6,9.9c-0.6,0-1.1-0.5-1.1-1.2c0-0.6,0.5-1.2,1.1-1.2c0.6,0,1.1,0.5,1.1,1.2 C7.1,9.4,6.6,9.9,6,9.9z M10,9.9c-0.6,0-1.1-0.5-1.1-1.2c0-0.6,0.5-1.2,1.1-1.2c0.6,0,1.1,0.5,1.1,1.2C11.1,9.4,10.6,9.9,10,9.9z"/>
   </symbol>
diff --git a/plugins/contact-resources/src/components/ChannelsPresenter.svelte b/plugins/contact-resources/src/components/ChannelsPresenter.svelte
index 77ac54440d..d99758a4dd 100644
--- a/plugins/contact-resources/src/components/ChannelsPresenter.svelte
+++ b/plugins/contact-resources/src/components/ChannelsPresenter.svelte
@@ -65,7 +65,16 @@ let displayItems: Item[] = []
 
 </script>
 
-{#each displayItems as item}
-  <Icon icon={item.icon} size={'medium'}/>
-{/each}
+<div class="container">
+  {#each displayItems as item}
+    <Icon icon={item.icon} size={'medium'}/>
+  {/each}
+</div>
 
+<style lang="scss">
+  .container {
+    display: flex;
+    align-items: center;
+    :global(svg + svg) { margin-left: .25rem; }
+  }
+</style>
diff --git a/plugins/recruit-resources/src/components/DialogHeader.svelte b/plugins/recruit-resources/src/components/DialogHeader.svelte
index d6b0e04366..a18f8b11d8 100644
--- a/plugins/recruit-resources/src/components/DialogHeader.svelte
+++ b/plugins/recruit-resources/src/components/DialogHeader.svelte
@@ -140,11 +140,9 @@
       <Button label={ create ? 'Create' : 'Save' } size={'small'} transparent on:click={ () => { dispatch('save') } }/>
     {/if}
   </div>
-  <div class="abs-rt-content">
-    <Grid column={2} columnGap={.5}>
-      <div><Component is='contact:component:ChannelsPresenter' props={ { value: newValue.channels } }/></div>
-      <CircleButton icon={Edit} label={'Edit'} on:click={(ev) => showPopup(SocialEditor, { values: newValue.channels ?? [] }, ev.target, (result) => { newValue.channels = result; isChanged() })} />
-    </Grid>
+  <div class="abs-rt-content flex-row-center">
+    <div style="margin-right: .25rem"><Component is='contact:component:ChannelsPresenter' props={ { value: newValue.channels } }/></div>
+    <CircleButton icon={Edit} label={'Edit'} on:click={(ev) => showPopup(SocialEditor, { values: newValue.channels ?? [] }, ev.target, (result) => { newValue.channels = result; isChanged() })} />
   </div>
 </div>
 </form>