New: (Fixes #936) Icons add Lexicon icon merge

liferay · May 23, 2018 · 90bcf39 · 90bcf39
1 parent 38fbe6c
commit 90bcf39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/packages/clay-css/src/images/icons/merge.svg b/packages/clay-css/src/images/icons/merge.svg
diff --git a/packages/clay-css/src/scss/functions/_global-functions.scss b/packages/clay-css/src/scss/functions/_global-functions.scss
@@ -523,6 +523,8 @@
 
 	'mark-as-question': '<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 416 448"><path class="lexicon-icon-outline" d="M256 128c17.673 0 32-14.327 32-32 0-17.645 14.355-32 32-32s32 14.355 32 32c0 18.517-6.967 26.209-22.725 41.843C311.856 155.126 288 178.795 288 224c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.797 6.853-25.346 22.352-40.724C391.93 165.837 416 141.955 416 96c0-52.935-43.065-96-96-96s-96 43.065-96 96c0 17.673 14.327 32 32 32z" fill="#{$color}"/><circle cx="320" cy="320" r="32"/><path class="lexicon-icon-outline" d="M32 352h128c17.673 0 32-14.327 32-32s-14.327-32-32-32H32c-17.673 0-32 14.327-32 32s14.327 32 32 32zM352 384H32c-17.673 0-32 14.327-32 32s14.327 32 32 32h320c17.673 0 32-14.327 32-32s-14.327-32-32-32z" fill="#{$color}"/></svg>',
 
+	'merge': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="lexicon-icon-outline" d="M322.6 238.2l-115.5-59c89-52.6 45-179.2-47-179.2-112 0-130.6 154.6-32 186.1v182.2c-44.7 27.6-53.3 140.9 48 143.6 96 1.3 108.6-134 16-158.3V243.4l97.1 49.6c-13.1 88.3 110.2 126.9 150.8 46.9 36.7-91.3-62.6-143.3-117.4-101.7zM160.1 48c66.6 0 62 96 0 96-64.6-.1-62.6-96 0-96zm16 431.8c-66 0-62-96 0-96 61.3.1 65.3 95.4 0 96zM368 351.9c-60 0-64.6-96 0-96 62.7 0 63.3 96 0 96z" fill="#{$color}"/></svg>',
+
 	'message-boards': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="lexicon-icon-outline message-boards-speech-balloon-content1" d="M272.8 256.1h-160c-22.4 0-22.4 32 0 32h160c19.2 0 22.4-32 0-32z" fill="#{$color}"/><path class="lexicon-icon-outline message-boards-speech-balloon-content2" d="M208.8 320.1h-96c-22.4 0-22.4 32 0 32h96c19.2 0 22.4-32 0-32z" fill="#{$color}"/><path class="lexicon-icon-outline message-boards-speech-balloon-outline" d="M352 160.1H32c-17.7 0-32 14.3-32 32v224c0 17.7 14.3 32 32 32h32v32c.4 30.2 36.2 41.7 54.6 22.6l54.4-54.6h179c17.7 0 32-14.3 32-32v-224c0-17.7-14.4-32-32-32zm0 256H32v-224h320v224z" fill="#{$color}"/><path class="lexicon-icon-outline message-boards-speech-balloon-solid" d="M480 64.1h-32v-32c.3-25.1-31.5-44.5-54.6-22.6L339 64.1H160c-17.7 0-32 14.3-32 32v32h225.2c34.7 0 62.8 28.1 62.8 62.8v161.2h64c17.7 0 32-14.3 32-32v-224c-.1-17.6-14.4-32-32-32z" fill="#{$color}"/></svg>',
 
 	'message': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="lexicon-icon-outline message-speech-balloon-outline" d="M480 31.9H32c-19.2 0-32 12.8-32 32v320c0 19.2 12.8 32 32 32h64v32c0 25.6 32 44.8 54.4 22.4l54.4-54.4H480c19.2 0 32-12.8 32-32v-320c0-19.2-12.8-32-32-32zm-32 320H64v-256h384v256z" fill="#{$color}"/><path class="lexicon-icon-outline message-speech-balloon-content1" d="M336 159.9H144c-22.4 0-22.4 32 0 32h192c19.2 0 22.4-32 0-32z" fill="#{$color}"/><path class="lexicon-icon-outline message-speech-balloon-content2" d="M272 255.9H144c-22.4 0-22.4 32 0 32h128c19.2 0 22.4-32 0-32z" fill="#{$color}"/></svg>',