From 684cd77ad38e1e575f052b8b3e9f93b68b60cc3b Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Fri, 10 Jan 2020 16:32:31 +0800
Subject: [PATCH] Fixed space and icon display issues before and after the
input box (#1798)
* merge dev branch front-end code
* fix udfs assignment
* Fix task instance page jump
* fix udfs assignment and task instance page jump #1789
* Fixed space and icon display issues before and after the input box
* add license
* add license
---
dolphinscheduler-ui/.editorconfig | 19 +++++++++++++++++--
dolphinscheduler-ui/.env | 18 +++++++++++++++++-
.../pages/monitor/pages/servers/servers.scss | 2 +-
.../_source/instanceConditions/index.vue | 4 ++--
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/dolphinscheduler-ui/.editorconfig b/dolphinscheduler-ui/.editorconfig
index 073296e85..6f3afb287 100644
--- a/dolphinscheduler-ui/.editorconfig
+++ b/dolphinscheduler-ui/.editorconfig
@@ -1,5 +1,20 @@
-# editorconfig.org
-# author: axin
+/*
+ * 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.
+ */
+
root = true
[*]
diff --git a/dolphinscheduler-ui/.env b/dolphinscheduler-ui/.env
index 6da217b45..eca7f3f2e 100644
--- a/dolphinscheduler-ui/.env
+++ b/dolphinscheduler-ui/.env
@@ -1,5 +1,21 @@
+/*
+ * 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.
+ */
# back end interface address
-API_BASE = http://192.168.xx.xx:12345
+API_BASE = http://192.xx.xx.xx:12345
# If IP access is required for local development, remove the "#"
#DEV_HOST = 192.168.xx.xx
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
index 2c100e2d9..fd3c6c437 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
@@ -85,7 +85,7 @@
font-size: 72px;
}
>.state {
- >i {
+ >em {
font-size: 50px;
}
.success {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
index bbade46f2..2f30f0bea 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
@@ -52,10 +52,10 @@
-
+
-
+
--
GitLab