diff --git a/NOTICE b/NOTICE index 750c8d51d..fe4d0a205 100644 --- a/NOTICE +++ b/NOTICE @@ -2,4 +2,9 @@ Apache SkyWalking Copyright 2017-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +This product bundles icons/fonts from the ant-design project, +https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont +Licensed under the MIT license, confirmed by ant-design team member. +https://github.com/ant-design/ant-design/issues/10243 \ No newline at end of file diff --git a/apm-dist/release-docs/NOTICE b/apm-dist/release-docs/NOTICE index b47262df5..d60cf6376 100644 --- a/apm-dist/release-docs/NOTICE +++ b/apm-dist/release-docs/NOTICE @@ -829,3 +829,10 @@ grants independently of ICOT any specific warranty to the user in writing, such person, organization or entity, will also be exempted from and not be held liable to the user for any such damages as noted above as far as the program is concerned. + +------ + +This product bundles icons/fonts from the ant-design project, +https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont +Licensed under the MIT license, confirmed by ant-design team member. +https://github.com/ant-design/ant-design/issues/10243 diff --git a/pom.xml b/pom.xml index 6c2fa25b4..dffe2adaa 100644 --- a/pom.xml +++ b/pom.xml @@ -172,6 +172,8 @@ **/skywalking-ui/.eslintrc **/skywalking-ui/.stylelintrc + + **/skywalking-ui/public/font/iconfont/** **/.gitignore diff --git a/skywalking-ui b/skywalking-ui index 3ecf33899..f9c602936 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 3ecf33899e28ac106e1d421c089c4c4a4d79c23d +Subproject commit f9c602936ab4f386576bf16f203efac61962e424