You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/18 14:28:32 UTC
[incubator-skywalking-ui] 01/01: Update license
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 31dca39115d475e97683f5e2c0ff2bbe0d5ea7ef
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sun Mar 18 22:28:19 2018 +0800
Update license
---
public/img/icon/app.png | Bin 0 -> 6140 bytes
public/img/icon/app.svg | 1 -
public/img/icon/service.png | Bin 0 -> 9892 bytes
public/img/icon/service.svg | 1 -
src/common/menu.js | 8 ++++----
src/components/Charts/ChartCard/index.less | 17 +++++++++++++++++
src/components/Charts/Field/index.less | 17 +++++++++++++++++
src/components/Charts/Pie/index.less | 17 +++++++++++++++++
src/components/SiderMenu/SiderMenu.js | 5 ++++-
src/index.ejs | 1 -
src/routes/Dashboard/Dashboard.js | 4 ++--
11 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/public/img/icon/app.png b/public/img/icon/app.png
new file mode 100644
index 0000000..d26ea8a
Binary files /dev/null and b/public/img/icon/app.png differ
diff --git a/public/img/icon/app.svg b/public/img/icon/app.svg
deleted file mode 100644
index 4116c21..0000000
--- a/public/img/icon/app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M357.885 49.289h285.276c173.87 0 316.906 143.086 316.906 317.854v285.276c0 173.831-143.086 316.925-316.906 316.925h-285.276c-174.749 0-317.854-143.086-317.854-316.925v-285.276c0-174.749 143.086-317.854 317.854-317.854z" fill= [...]
\ No newline at end of file
diff --git a/public/img/icon/service.png b/public/img/icon/service.png
new file mode 100644
index 0000000..085b91b
Binary files /dev/null and b/public/img/icon/service.png differ
diff --git a/public/img/icon/service.svg b/public/img/icon/service.svg
deleted file mode 100644
index 8d2daf7..0000000
--- a/public/img/icon/service.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M151.3048309167421 870.0138201689984c199.20612239587413 199.20612239587422 522.1842157706417 199.20612239587433 721.3924594868594-0.002121320343348998 199.2068295026554-199.20682950265532 199.20682950265544-522.1849228774227 [...]
\ No newline at end of file
diff --git a/src/common/menu.js b/src/common/menu.js
index b3210b2..344043c 100644
--- a/src/common/menu.js
+++ b/src/common/menu.js
@@ -24,7 +24,7 @@ const menuData = [{
path: 'dashboard',
}, {
name: 'Topology',
- icon: 'iconfont icon-network',
+ icon: 'fork',
path: 'topology',
}, {
name: 'Application',
@@ -32,7 +32,7 @@ const menuData = [{
path: 'application',
}, {
name: 'Server',
- icon: 'iconfont icon-server',
+ icon: 'database',
path: 'server',
}, {
name: 'Service',
@@ -40,11 +40,11 @@ const menuData = [{
path: 'service',
}, {
name: 'Trace',
- icon: 'iconfont icon-icon-traces-search',
+ icon: 'exception',
path: 'trace',
}, {
name: 'Alarm',
- icon: 'iconfont icon-ALERT',
+ icon: 'bell',
path: 'alarm',
}];
diff --git a/src/components/Charts/ChartCard/index.less b/src/components/Charts/ChartCard/index.less
index 02a1d7e..9673279 100644
--- a/src/components/Charts/ChartCard/index.less
+++ b/src/components/Charts/ChartCard/index.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
@import "~antd/lib/style/themes/default.less";
.chartCard {
diff --git a/src/components/Charts/Field/index.less b/src/components/Charts/Field/index.less
index 2848f9d..2a0e0b4 100644
--- a/src/components/Charts/Field/index.less
+++ b/src/components/Charts/Field/index.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
@import "~antd/lib/style/themes/default.less";
.field {
diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less
index 9478739..8422a5a 100644
--- a/src/components/Charts/Pie/index.less
+++ b/src/components/Charts/Pie/index.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
@import "~antd/lib/style/themes/default.less";
.pie {
diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js
index ebe3615..1bf31da 100644
--- a/src/components/SiderMenu/SiderMenu.js
+++ b/src/components/SiderMenu/SiderMenu.js
@@ -33,8 +33,11 @@ const getIcon = (icon) => {
if (typeof icon === 'string' && icon.indexOf('http') === 0) {
return <img src={icon} alt="icon" className={styles.icon} />;
}
+ if (typeof icon === 'string' && icon.indexOf('/img') === 0) {
+ return <img src={icon} alt="icon" className={styles.icon} />;
+ }
if (typeof icon === 'string') {
- return (icon.indexOf('iconfont') > -1) ? <i className={icon} /> : <Icon type={icon} />;
+ return <Icon type={icon} />;
}
return icon;
};
diff --git a/src/index.ejs b/src/index.ejs
index ea9c429..5e78d85 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -23,7 +23,6 @@ limitations under the License.
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Sky Walking</title>
<link rel="icon" href="/favicon.png" type="image/x-icon">
- <link rel="stylesheet" href="css/iconfont.css" />
</head>
<body>
diff --git a/src/routes/Dashboard/Dashboard.js b/src/routes/Dashboard/Dashboard.js
index 0985217..50e1fcc 100644
--- a/src/routes/Dashboard/Dashboard.js
+++ b/src/routes/Dashboard/Dashboard.js
@@ -58,14 +58,14 @@ export default class Dashboard extends PureComponent {
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="App"
- avatar={<img style={{ width: 56, height: 56 }} src="img/icon/app.svg" alt="app" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/app.png" alt="app" />}
total={data.getClusterBrief.numOfApplication}
/>
</Col>
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="Service"
- avatar={<img style={{ width: 56, height: 56 }} src="img/icon/service.svg" alt="service" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/service.png" alt="service" />}
total={data.getClusterBrief.numOfService}
/>
</Col>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.