You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/03/01 06:59:55 UTC

[incubator-hop] branch master updated: HOP-2281 New icons for logging (meta and transform)

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new f660bdd  HOP-2281 New icons for logging (meta and transform)
     new a721163  Merge pull request #652 from nadment/HOP-2281
f660bdd is described below

commit f660bdd297cada2d18c6274fd2bb58d4a2d435fe
Author: nadment <na...@gmail.com>
AuthorDate: Sun Feb 28 21:44:27 2021 +0100

    HOP-2281 New icons for logging (meta and transform)
---
 .../hop/reflection/pipeline/meta/PipelineLog.java  |  2 +-
 .../pipeline/transform/PipelineLoggingMeta.java    |  2 +-
 .../hop/reflection/workflow/meta/WorkflowLog.java  |  2 +-
 .../workflow/transform/WorkflowLoggingMeta.java    |  2 +-
 .../reflection/src/main/resources/pipeline-log.svg | 49 ++++++++++++++++++++++
 .../reflection/src/main/resources/workflow-log.svg | 41 ++++++++++++++++++
 .../org/apache/hop/ui/core/gui/GuiResource.java    |  2 +-
 ui/src/main/resources/ui/images/log.svg            | 35 ++++++++++++++++
 8 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/meta/PipelineLog.java b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/meta/PipelineLog.java
index 355f8d1..b2f6282 100644
--- a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/meta/PipelineLog.java
+++ b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/meta/PipelineLog.java
@@ -27,7 +27,7 @@ import org.apache.hop.metadata.api.IHopMetadata;
     key = "pipeline-log",
     name = "Pipeline Log",
     description = "This metadata object type allows you to log activity of a pipeline with another pipeline",
-    image = "ui/images/show-log.svg")
+    image = "pipeline-log.svg")
 public class PipelineLog extends HopMetadataBase implements IHopMetadata {
 
   @HopMetadataProperty private boolean enabled;
diff --git a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/transform/PipelineLoggingMeta.java b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/transform/PipelineLoggingMeta.java
index a1255f7..ffb0ef8 100644
--- a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/transform/PipelineLoggingMeta.java
+++ b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/transform/PipelineLoggingMeta.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
   name = "i18n::PipelineLogging.Transform.Name",
   description = "i18n::PipelineLogging.Transform.Description",
   categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Input",
-  image = "ui/images/show-log.svg",
+  image = "pipeline-log.svg",
   keywords = "audit,log,metrics")
 public class PipelineLoggingMeta extends BaseTransformMeta
     implements ITransformMeta<PipelineLogging, PipelineLoggingData> {
diff --git a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/meta/WorkflowLog.java b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/meta/WorkflowLog.java
index 3e20c2a..697aaf7 100644
--- a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/meta/WorkflowLog.java
+++ b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/meta/WorkflowLog.java
@@ -27,7 +27,7 @@ import org.apache.hop.metadata.api.IHopMetadata;
     key = "workflow-log",
     name = "Workflow Log",
     description = "This metadata object type allows you to log activity of a workflow with a pipeline",
-    image = "ui/images/show-log.svg")
+    image = "workflow-log.svg")
 public class WorkflowLog extends HopMetadataBase implements IHopMetadata {
 
   @HopMetadataProperty private boolean enabled;
diff --git a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/transform/WorkflowLoggingMeta.java b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/transform/WorkflowLoggingMeta.java
index b89a638..3097e49 100644
--- a/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/transform/WorkflowLoggingMeta.java
+++ b/plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/transform/WorkflowLoggingMeta.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
   name = "i18n::WorkflowLogging.Transform.Name",
   description = "i18n::WorkflowLogging.Transform.Description",
   categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Input",
-  image = "ui/images/show-log.svg",
+  image = "workflow-log.svg",
   keywords = "audit,log,metrics")
 public class WorkflowLoggingMeta extends BaseTransformMeta
     implements ITransformMeta<WorkflowLogging, WorkflowLoggingData> {
diff --git a/plugins/misc/reflection/src/main/resources/pipeline-log.svg b/plugins/misc/reflection/src/main/resources/pipeline-log.svg
new file mode 100644
index 0000000..b377180
--- /dev/null
+++ b/plugins/misc/reflection/src/main/resources/pipeline-log.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-3 -2 24 24" enable-background="new -3 -2 24 24" xml:space="preserve">
+<defs>
+</defs>
+<path fill="#0F3B5A" d="M0,0v17.992h5.076c0-0.517,0-0.956,0-1.418H1.503V1.418h12.029V9.93c0.478,0,1.025,0,1.503,0V0H0z"/>
+<path fill="#0F3B5A" d="M9.22,18.102c-0.435,0-0.824-0.066-1.164-0.203c-0.339-0.138-0.627-0.323-0.863-0.562
+	c-0.236-0.238-0.415-0.522-0.537-0.854c-0.123-0.332-0.184-0.696-0.184-1.093c0-0.393,0.063-0.751,0.184-1.081
+	c0.124-0.33,0.301-0.614,0.537-0.856c0.233-0.238,0.523-0.426,0.863-0.561c0.339-0.134,0.727-0.201,1.164-0.201
+	c0.435,0,0.821,0.067,1.164,0.201c0.338,0.135,0.627,0.322,0.862,0.561c0.234,0.24,0.416,0.526,0.536,0.856
+	c0.123,0.33,0.185,0.691,0.185,1.081c0,0.398-0.062,0.761-0.185,1.093c-0.123,0.33-0.3,0.616-0.536,0.854
+	c-0.235,0.238-0.524,0.426-0.862,0.562C10.044,18.035,9.656,18.102,9.22,18.102z M9.22,17.208c0.267,0,0.497-0.054,0.694-0.159
+	s0.359-0.244,0.484-0.416s0.218-0.365,0.278-0.582c0.06-0.214,0.09-0.434,0.09-0.661c0-0.218-0.03-0.437-0.09-0.654
+	c-0.061-0.219-0.153-0.413-0.278-0.582c-0.125-0.17-0.287-0.307-0.484-0.412c-0.197-0.106-0.428-0.16-0.694-0.16
+	c-0.266,0-0.497,0.054-0.694,0.16c-0.197,0.105-0.357,0.242-0.484,0.412c-0.125,0.169-0.221,0.363-0.278,0.582
+	c-0.062,0.218-0.09,0.437-0.09,0.654c0,0.225,0.031,0.445,0.09,0.661c0.058,0.217,0.153,0.41,0.278,0.582
+	c0.126,0.172,0.288,0.311,0.484,0.416C8.723,17.154,8.954,17.208,9.22,17.208z"/>
+<path fill="#0F3B5A" d="M17.998,17.696c0,0.775-0.229,1.353-0.689,1.732C16.85,19.809,16.188,20,15.324,20
+	c-0.273,0-0.549-0.026-0.825-0.08c-0.276-0.053-0.529-0.143-0.757-0.267c-0.229-0.127-0.421-0.292-0.573-0.496
+	c-0.155-0.204-0.246-0.457-0.274-0.755h1.199c0.035,0.159,0.096,0.287,0.181,0.388c0.084,0.101,0.184,0.177,0.301,0.232
+	c0.114,0.056,0.244,0.094,0.385,0.109c0.141,0.015,0.287,0.023,0.44,0.023c0.485,0,0.839-0.112,1.065-0.336
+	c0.224-0.226,0.334-0.55,0.334-0.974v-0.783h-0.02c-0.169,0.283-0.397,0.507-0.69,0.664c-0.291,0.159-0.605,0.238-0.941,0.238
+	c-0.436,0-0.806-0.07-1.11-0.214c-0.305-0.143-0.559-0.339-0.759-0.586c-0.198-0.248-0.346-0.534-0.437-0.859
+	c-0.092-0.324-0.138-0.67-0.138-1.042c0-0.346,0.057-0.671,0.17-0.983c0.112-0.311,0.274-0.585,0.483-0.818
+	c0.211-0.234,0.471-0.422,0.774-0.563c0.306-0.139,0.651-0.207,1.037-0.207c0.343,0,0.659,0.066,0.946,0.202
+	c0.288,0.134,0.509,0.349,0.664,0.64h0.02v-0.706H18L17.998,17.696L17.998,17.696z M15.336,17.069c0.267,0,0.493-0.051,0.679-0.152
+	c0.187-0.104,0.338-0.239,0.454-0.408c0.118-0.169,0.199-0.361,0.253-0.576c0.052-0.215,0.078-0.43,0.078-0.651
+	c0-0.218-0.028-0.43-0.085-0.635c-0.055-0.204-0.143-0.387-0.257-0.546c-0.115-0.16-0.266-0.284-0.454-0.379
+	c-0.186-0.093-0.408-0.138-0.668-0.138c-0.267,0-0.491,0.054-0.673,0.159c-0.182,0.106-0.331,0.243-0.443,0.412
+	c-0.112,0.17-0.192,0.361-0.241,0.575c-0.051,0.215-0.074,0.43-0.074,0.641c0,0.213,0.028,0.419,0.084,0.621
+	c0.057,0.202,0.143,0.381,0.258,0.543c0.117,0.159,0.264,0.287,0.441,0.387C14.867,17.021,15.083,17.069,15.336,17.069z"/>
+<path id="path8080-6_1_" fill="#53C3C4" d="M9.732,2.083c-0.117,0-0.23,0.006-0.341,0.018
+	C8.5,2.198,7.747,2.642,7.254,2.931c-0.516,0.304-1.166,0.781-1.852,0.99C4.718,4.13,4.062,4.099,3.415,3.409
+	c-0.246-0.27-0.596-0.2-0.783,0.154c-0.187,0.355-0.139,0.86,0.107,1.13C2.743,4.697,2.747,4.701,2.75,4.705
+	C3.693,5.71,4.76,5.766,5.634,5.499c0.875-0.267,1.621-0.827,2.043-1.075c0.484-0.285,1.118-0.641,1.798-0.715
+	c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.281,0.592,0.229,0.785-0.116c0.195-0.345,0.16-0.853-0.08-1.134
+	c-0.004-0.006-0.01-0.012-0.014-0.018C11.449,2.424,10.543,2.087,9.732,2.083L9.732,2.083z M9.732,5.308
+	c-0.117,0-0.23,0.006-0.341,0.018C8.5,5.422,7.747,5.866,7.254,6.155c-0.516,0.304-1.166,0.781-1.852,0.99
+	C4.718,7.354,4.062,7.323,3.415,6.633c-0.246-0.269-0.596-0.2-0.783,0.155c-0.187,0.354-0.139,0.86,0.107,1.129
+	C2.743,7.921,2.747,7.925,2.75,7.929C3.693,8.935,4.76,8.99,5.634,8.723c0.875-0.267,1.621-0.827,2.043-1.075
+	c0.484-0.285,1.118-0.641,1.798-0.715c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.281,0.592,0.229,0.785-0.116
+	c0.195-0.345,0.16-0.853-0.08-1.134c-0.004-0.006-0.01-0.012-0.014-0.017C11.449,5.648,10.543,5.312,9.732,5.308L9.732,5.308z
+	 M9.732,8.532c-0.117,0-0.23,0.006-0.341,0.018C8.5,8.646,7.747,9.09,7.254,9.379c-0.516,0.304-1.166,0.781-1.852,0.99
+	c-0.685,0.208-1.341,0.177-1.988-0.513c-0.246-0.269-0.596-0.2-0.783,0.155c-0.187,0.354-0.139,0.86,0.107,1.129
+	c0.004,0.005,0.008,0.009,0.012,0.013c0.942,1.005,2.01,1.061,2.884,0.794c0.875-0.268,1.621-0.827,2.043-1.075
+	c0.484-0.285,1.118-0.641,1.798-0.715c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.282,0.592,0.229,0.785-0.115
+	c0.195-0.345,0.16-0.853-0.08-1.134c-0.004-0.006-0.01-0.012-0.014-0.017C11.449,8.872,10.543,8.536,9.732,8.532L9.732,8.532z"/>
+</svg>
diff --git a/plugins/misc/reflection/src/main/resources/workflow-log.svg b/plugins/misc/reflection/src/main/resources/workflow-log.svg
new file mode 100644
index 0000000..8f9f1c5
--- /dev/null
+++ b/plugins/misc/reflection/src/main/resources/workflow-log.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill="#0F3B5A" d="M3,2v17.992h5.076c0-0.517,0-0.956,0-1.418H4.503V3.418h12.029v8.511c0.478,0,1.025,0,1.503,0V2H3z"/>
+<path fill="#0F3B5A" d="M12.22,20.102c-0.435,0-0.824-0.066-1.164-0.203c-0.339-0.138-0.627-0.323-0.863-0.562
+	c-0.236-0.238-0.415-0.522-0.537-0.854c-0.123-0.332-0.184-0.696-0.184-1.093c0-0.393,0.063-0.751,0.184-1.081
+	c0.124-0.33,0.301-0.614,0.537-0.856c0.233-0.238,0.523-0.426,0.863-0.561c0.339-0.134,0.727-0.201,1.164-0.201
+	c0.435,0,0.821,0.067,1.164,0.201c0.338,0.135,0.627,0.322,0.862,0.561c0.234,0.24,0.416,0.526,0.536,0.856
+	c0.123,0.33,0.185,0.691,0.185,1.081c0,0.398-0.062,0.761-0.185,1.093c-0.123,0.33-0.3,0.616-0.536,0.854
+	c-0.235,0.238-0.524,0.426-0.862,0.562C13.044,20.035,12.656,20.102,12.22,20.102z M12.22,19.208c0.267,0,0.497-0.054,0.694-0.159
+	s0.359-0.244,0.484-0.416s0.218-0.365,0.278-0.582c0.06-0.214,0.09-0.434,0.09-0.661c0-0.218-0.03-0.437-0.09-0.654
+	c-0.061-0.219-0.153-0.413-0.278-0.582c-0.125-0.17-0.287-0.307-0.484-0.412c-0.197-0.106-0.428-0.16-0.694-0.16
+	c-0.266,0-0.497,0.054-0.694,0.16c-0.197,0.105-0.357,0.242-0.484,0.412c-0.125,0.169-0.221,0.363-0.278,0.582
+	c-0.062,0.218-0.09,0.437-0.09,0.654c0,0.225,0.031,0.445,0.09,0.661c0.058,0.217,0.153,0.41,0.278,0.582
+	c0.126,0.172,0.288,0.311,0.484,0.416C11.723,19.154,11.954,19.208,12.22,19.208z"/>
+<path fill="#0F3B5A" d="M20.998,19.696c0,0.775-0.229,1.353-0.689,1.732C19.85,21.809,19.188,22,18.324,22
+	c-0.273,0-0.549-0.026-0.825-0.08c-0.276-0.053-0.529-0.143-0.757-0.267c-0.229-0.127-0.421-0.292-0.573-0.496
+	c-0.155-0.204-0.246-0.457-0.274-0.755h1.199c0.035,0.159,0.096,0.287,0.181,0.388c0.084,0.101,0.184,0.177,0.301,0.232
+	c0.114,0.056,0.244,0.094,0.385,0.109c0.141,0.015,0.287,0.023,0.44,0.023c0.485,0,0.839-0.112,1.065-0.336
+	c0.224-0.226,0.334-0.55,0.334-0.974v-0.783h-0.02c-0.169,0.283-0.397,0.507-0.69,0.664c-0.291,0.159-0.605,0.238-0.941,0.238
+	c-0.436,0-0.806-0.07-1.11-0.214c-0.305-0.143-0.559-0.339-0.759-0.586c-0.198-0.248-0.346-0.534-0.437-0.859
+	c-0.092-0.324-0.138-0.67-0.138-1.042c0-0.346,0.057-0.671,0.17-0.983c0.112-0.311,0.274-0.585,0.483-0.818
+	c0.211-0.234,0.471-0.422,0.774-0.563c0.306-0.139,0.651-0.207,1.037-0.207c0.343,0,0.659,0.066,0.946,0.202
+	c0.288,0.134,0.509,0.349,0.664,0.64h0.02v-0.706H21L20.998,19.696L20.998,19.696z M18.336,19.069c0.267,0,0.493-0.051,0.679-0.152
+	c0.187-0.104,0.338-0.239,0.454-0.408c0.118-0.169,0.199-0.361,0.253-0.576c0.052-0.215,0.078-0.43,0.078-0.651
+	c0-0.218-0.028-0.43-0.085-0.635c-0.055-0.204-0.143-0.387-0.257-0.546c-0.115-0.16-0.266-0.284-0.454-0.379
+	c-0.186-0.093-0.408-0.138-0.668-0.138c-0.267,0-0.491,0.054-0.673,0.159c-0.182,0.106-0.331,0.243-0.443,0.412
+	c-0.112,0.17-0.192,0.361-0.241,0.575c-0.051,0.215-0.074,0.43-0.074,0.641c0,0.213,0.028,0.419,0.084,0.621
+	c0.057,0.202,0.143,0.381,0.258,0.543c0.117,0.159,0.264,0.287,0.441,0.387C17.867,19.021,18.083,19.069,18.336,19.069z"/>
+<g id="layer1" transform="translate(-379.90478,129.88361)">
+	<path id="rect8091-8" fill="#033D5D" d="M390.439-125.8c-0.2,0-0.401,0.077-0.555,0.23
+		l-1.599,1.599l0.566,0.567l1.365-1.365c0.062-0.062,0.142-0.092,0.222-0.092s0.16,0.031,0.222,0.092l1.066,1.066l-0.576,0.577
+		h1.722v-1.722l-0.578,0.578l-1.301-1.301C390.84-125.723,390.639-125.8,390.439-125.8L390.439-125.8z M386.375-123.25l0.578,0.578
+		l-1.301,1.301c-0.154,0.154-0.23,0.354-0.23,0.555s0.076,0.401,0.23,0.555l1.599,1.599l0.567-0.566l-1.365-1.365
+		c-0.062-0.062-0.092-0.142-0.092-0.222s0.03-0.16,0.092-0.222l1.066-1.067l0.577,0.577v-1.722H386.375z M393.593-122.937
+		l-0.567,0.567l1.365,1.365c0.062,0.062,0.092,0.142,0.092,0.222s-0.03,0.16-0.092,0.222l-1.066,1.067l-0.577-0.577v1.722h1.722
+		l-0.578-0.578l1.301-1.301c0.154-0.154,0.23-0.354,0.23-0.555s-0.076-0.401-0.23-0.555L393.593-122.937z M387.972-118.475v1.722
+		l0.578-0.578l1.301,1.301c0.153,0.154,0.354,0.23,0.555,0.23s0.401-0.076,0.555-0.23l1.599-1.599l-0.566-0.567l-1.365,1.366
+		c-0.062,0.061-0.142,0.092-0.222,0.092s-0.16-0.031-0.222-0.092l-1.066-1.067l0.576-0.577H387.972z"/>
+</g>
+</svg>
diff --git a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
index 97dbed9..35886f1 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
@@ -744,7 +744,7 @@ public class GuiResource {
     imageShowHistory =
         loadAsResource(display, "ui/images/show-history.svg", ConstUi.SMALL_ICON_SIZE);
     imageShow = loadAsResource(display, "ui/images/show.svg", ConstUi.SMALL_ICON_SIZE);
-    imageShowLog = loadAsResource(display, "ui/images/show-log.svg", ConstUi.SMALL_ICON_SIZE);
+    imageShowLog = loadAsResource(display, "ui/images/log.svg", ConstUi.SMALL_ICON_SIZE);
     imageShowPerf = loadAsResource(display, "ui/images/show-perf.svg", ConstUi.SMALL_ICON_SIZE);
     imageShowResults =
         loadAsResource(display, "ui/images/show-results.svg", ConstUi.SMALL_ICON_SIZE);
diff --git a/ui/src/main/resources/ui/images/log.svg b/ui/src/main/resources/ui/images/log.svg
new file mode 100644
index 0000000..d092615
--- /dev/null
+++ b/ui/src/main/resources/ui/images/log.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g>
+	<path fill="#0F3B5A" d="M3,2v17.992h5.076c0-0.517,0-0.956,0-1.418H4.503V3.418h12.029v8.511c0.478,0,1.025,0,1.503,0V2H3z"/>
+	<path fill="#0F3B5A" d="M6.006,4.849h9.02v1.418h-9.02V4.849z"/>
+	<path fill="#0F3B5A" d="M6.006,7.685h9.02v1.418h-9.02V7.685z"/>
+	<path fill="#0F3B5A" d="M6.006,10.524h9.02v1.418h-9.02V10.524L6.006,10.524z"/>
+	<path fill="#0F3B5A" d="M12.22,20.102c-0.435,0-0.824-0.066-1.164-0.203c-0.339-0.138-0.627-0.323-0.863-0.562
+		c-0.236-0.238-0.415-0.522-0.537-0.854c-0.123-0.332-0.184-0.696-0.184-1.093c0-0.393,0.063-0.751,0.184-1.081
+		c0.124-0.33,0.301-0.614,0.537-0.856c0.233-0.238,0.523-0.426,0.863-0.561c0.339-0.134,0.727-0.201,1.164-0.201
+		c0.435,0,0.821,0.067,1.164,0.201c0.338,0.135,0.627,0.322,0.862,0.561c0.234,0.24,0.416,0.526,0.536,0.856
+		c0.123,0.33,0.185,0.691,0.185,1.081c0,0.398-0.062,0.761-0.185,1.093c-0.123,0.33-0.3,0.616-0.536,0.854
+		c-0.235,0.238-0.524,0.426-0.862,0.562C13.044,20.035,12.656,20.102,12.22,20.102z M12.22,19.208c0.267,0,0.497-0.054,0.694-0.159
+		s0.359-0.244,0.484-0.416s0.218-0.365,0.278-0.582c0.06-0.214,0.09-0.434,0.09-0.661c0-0.218-0.03-0.437-0.09-0.654
+		c-0.061-0.219-0.153-0.413-0.278-0.582c-0.125-0.17-0.287-0.307-0.484-0.412c-0.197-0.106-0.428-0.16-0.694-0.16
+		c-0.266,0-0.497,0.054-0.694,0.16c-0.197,0.105-0.357,0.242-0.484,0.412c-0.125,0.169-0.221,0.363-0.278,0.582
+		c-0.062,0.218-0.09,0.437-0.09,0.654c0,0.225,0.031,0.445,0.09,0.661c0.058,0.217,0.153,0.41,0.278,0.582
+		c0.126,0.172,0.288,0.311,0.484,0.416C11.723,19.154,11.954,19.208,12.22,19.208z"/>
+	<path fill="#0F3B5A" d="M20.998,19.696c0,0.775-0.229,1.353-0.689,1.732C19.85,21.809,19.188,22,18.324,22
+		c-0.273,0-0.549-0.026-0.825-0.08c-0.276-0.053-0.529-0.143-0.757-0.267c-0.229-0.127-0.421-0.292-0.573-0.496
+		c-0.155-0.204-0.246-0.457-0.274-0.755h1.199c0.035,0.159,0.096,0.287,0.181,0.388c0.084,0.101,0.184,0.177,0.301,0.232
+		c0.114,0.056,0.244,0.094,0.385,0.109c0.141,0.015,0.287,0.023,0.44,0.023c0.485,0,0.839-0.112,1.065-0.336
+		c0.224-0.226,0.334-0.55,0.334-0.974v-0.783h-0.02c-0.169,0.283-0.397,0.507-0.69,0.664c-0.291,0.159-0.605,0.238-0.941,0.238
+		c-0.436,0-0.806-0.07-1.11-0.214c-0.305-0.143-0.559-0.339-0.759-0.586c-0.198-0.248-0.346-0.534-0.437-0.859
+		c-0.092-0.324-0.138-0.67-0.138-1.042c0-0.346,0.057-0.671,0.17-0.983c0.112-0.311,0.274-0.585,0.483-0.818
+		c0.211-0.234,0.471-0.422,0.774-0.563c0.306-0.139,0.651-0.207,1.037-0.207c0.343,0,0.659,0.066,0.946,0.202
+		c0.288,0.134,0.509,0.349,0.664,0.64h0.02v-0.706H21L20.998,19.696L20.998,19.696z M18.336,19.069c0.267,0,0.493-0.051,0.679-0.152
+		c0.187-0.104,0.338-0.239,0.454-0.408c0.118-0.169,0.199-0.361,0.253-0.576c0.052-0.215,0.078-0.43,0.078-0.651
+		c0-0.218-0.028-0.43-0.085-0.635c-0.055-0.204-0.143-0.387-0.257-0.546c-0.115-0.16-0.266-0.284-0.454-0.379
+		c-0.186-0.093-0.408-0.138-0.668-0.138c-0.267,0-0.491,0.054-0.673,0.159c-0.182,0.106-0.331,0.243-0.443,0.412
+		c-0.112,0.17-0.192,0.361-0.241,0.575c-0.051,0.215-0.074,0.43-0.074,0.641c0,0.213,0.028,0.419,0.084,0.621
+		c0.057,0.202,0.143,0.381,0.258,0.543c0.117,0.159,0.264,0.287,0.441,0.387C17.867,19.021,18.083,19.069,18.336,19.069z"/>
+</g>
+</svg>