This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 5ee12015 Sync with designer
5ee12015 is described below
commit 5ee1201591362dfbc5e2e8948f1b740aaedd0540
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Jan 3 09:59:36 2024 -0500
Sync with designer
---
karavan-designer/package-lock.json | 2 +-
karavan-space/src/designer/beans/bean.css | 9 +++---
.../property/property/DslPropertyField.css | 2 +-
karavan-space/src/designer/rest/rest.css | 34 +++++++++++++++++-----
.../karavan-app/src/main/webui/package-lock.json | 2 +-
.../src/main/webui/src/designer/beans/bean.css | 9 +++---
.../src/main/webui/src/designer/rest/rest.css | 34 +++++++++++++++++-----
7 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/karavan-designer/package-lock.json
b/karavan-designer/package-lock.json
index 2ce666f4..15beea0d 100644
--- a/karavan-designer/package-lock.json
+++ b/karavan-designer/package-lock.json
@@ -42,7 +42,7 @@
}
},
"../karavan-core": {
- "version": "4.1.1",
+ "version": "4.3.0",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.7",
diff --git a/karavan-space/src/designer/beans/bean.css
b/karavan-space/src/designer/beans/bean.css
index 38b8fb51..d2fe4b12 100644
--- a/karavan-space/src/designer/beans/bean.css
+++ b/karavan-space/src/designer/beans/bean.css
@@ -17,8 +17,8 @@
.karavan .bean-card {
/*max-width: 800px;*/
- border-style: dotted;
- border-radius: 4px;
+ border-style: dashed;
+ border-radius: 42px;
border-width: 1px;
padding: 16px 6px 16px 16px;
margin-right: 80px;
@@ -50,9 +50,8 @@
}
.karavan .bean-card .delete-button {
- position: absolute;
- top: 3px;
- right: 3px;
+ position: relative;
+ right: 6px;
line-height: 1;
border: 0;
padding: 0;
diff --git a/karavan-space/src/designer/property/property/DslPropertyField.css
b/karavan-space/src/designer/property/property/DslPropertyField.css
index 3866f7d6..fa823ac1 100644
--- a/karavan-space/src/designer/property/property/DslPropertyField.css
+++ b/karavan-space/src/designer/property/property/DslPropertyField.css
@@ -19,7 +19,7 @@
padding-right: 12px;
}
-.karavan .designer-page .properties .infra-button {
+.karavan .properties .infra-button {
width: 1em;
height: 1em;
vertical-align: -0.125em;
diff --git a/karavan-space/src/designer/rest/rest.css
b/karavan-space/src/designer/rest/rest.css
index c9fa958f..92db3484 100644
--- a/karavan-space/src/designer/rest/rest.css
+++ b/karavan-space/src/designer/rest/rest.css
@@ -18,8 +18,8 @@
.karavan .rest-designer .rest-card,
.karavan .rest-designer .rest-config-card,
.karavan .rest-designer .method-card {
- border-style: dotted;
- border-radius: 4px;
+ border-style: dashed;
+ border-radius: 42px;
border-width: 1px;
}
@@ -36,9 +36,16 @@
}
.karavan .rest-designer .method-card {
- padding: 0 0 0 6px;
+ padding: 0 0 0 16px;
margin-bottom: 6px;
position: relative;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ gap: 16px;
+ height: 44px;
+ cursor: pointer;
}
.karavan .rest-card-unselected {
@@ -152,6 +159,7 @@
.karavan .rest-designer .method-card .rest-method-desc {
display: flex;
flex-direction: column;
+ flex: auto;
}
.karavan .rest-designer .rest-card-unselected,
@@ -188,8 +196,7 @@
position: relative;
}
-.karavan .rest-designer .rest-config-card,
-.karavan .rest-designer .method-card {
+.karavan .rest-designer .rest-config-card {
position: relative;
display: flex;
flex-direction: row;
@@ -236,8 +243,7 @@
text-overflow: ellipsis;
}
-.karavan .rest-designer .rest-config-card .delete-button,
-.karavan .rest-designer .method-card .delete-button {
+.karavan .rest-designer .rest-config-card .delete-button {
position: absolute;
top: 1px;
right: 1px;
@@ -251,6 +257,20 @@
z-index: 100;
}
+.karavan .rest-designer .method-card .delete-button {
+ position: relative;
+ top: unset;
+ right: 6px;
+ line-height: unset;
+ border: 0;
+ padding: 0;
+ margin: 0;
+ background: transparent;
+ color: #909090;
+ visibility: hidden;
+ z-index: 100;
+}
+
.karavan .rest-designer .rest-config-card:hover .delete-button,
.karavan .rest-designer .rest-card:hover .delete-button,
.karavan .rest-designer .method-card:hover .delete-button {
diff --git a/karavan-web/karavan-app/src/main/webui/package-lock.json
b/karavan-web/karavan-app/src/main/webui/package-lock.json
index 51748ae0..5594d202 100644
--- a/karavan-web/karavan-app/src/main/webui/package-lock.json
+++ b/karavan-web/karavan-app/src/main/webui/package-lock.json
@@ -50,7 +50,7 @@
}
},
"../../../../../karavan-core": {
- "version": "4.1.1",
+ "version": "4.3.0",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.7",
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/beans/bean.css
b/karavan-web/karavan-app/src/main/webui/src/designer/beans/bean.css
index 38b8fb51..d2fe4b12 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/beans/bean.css
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/beans/bean.css
@@ -17,8 +17,8 @@
.karavan .bean-card {
/*max-width: 800px;*/
- border-style: dotted;
- border-radius: 4px;
+ border-style: dashed;
+ border-radius: 42px;
border-width: 1px;
padding: 16px 6px 16px 16px;
margin-right: 80px;
@@ -50,9 +50,8 @@
}
.karavan .bean-card .delete-button {
- position: absolute;
- top: 3px;
- right: 3px;
+ position: relative;
+ right: 6px;
line-height: 1;
border: 0;
padding: 0;
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css
b/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css
index c9fa958f..92db3484 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/rest/rest.css
@@ -18,8 +18,8 @@
.karavan .rest-designer .rest-card,
.karavan .rest-designer .rest-config-card,
.karavan .rest-designer .method-card {
- border-style: dotted;
- border-radius: 4px;
+ border-style: dashed;
+ border-radius: 42px;
border-width: 1px;
}
@@ -36,9 +36,16 @@
}
.karavan .rest-designer .method-card {
- padding: 0 0 0 6px;
+ padding: 0 0 0 16px;
margin-bottom: 6px;
position: relative;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ gap: 16px;
+ height: 44px;
+ cursor: pointer;
}
.karavan .rest-card-unselected {
@@ -152,6 +159,7 @@
.karavan .rest-designer .method-card .rest-method-desc {
display: flex;
flex-direction: column;
+ flex: auto;
}
.karavan .rest-designer .rest-card-unselected,
@@ -188,8 +196,7 @@
position: relative;
}
-.karavan .rest-designer .rest-config-card,
-.karavan .rest-designer .method-card {
+.karavan .rest-designer .rest-config-card {
position: relative;
display: flex;
flex-direction: row;
@@ -236,8 +243,7 @@
text-overflow: ellipsis;
}
-.karavan .rest-designer .rest-config-card .delete-button,
-.karavan .rest-designer .method-card .delete-button {
+.karavan .rest-designer .rest-config-card .delete-button {
position: absolute;
top: 1px;
right: 1px;
@@ -251,6 +257,20 @@
z-index: 100;
}
+.karavan .rest-designer .method-card .delete-button {
+ position: relative;
+ top: unset;
+ right: 6px;
+ line-height: unset;
+ border: 0;
+ padding: 0;
+ margin: 0;
+ background: transparent;
+ color: #909090;
+ visibility: hidden;
+ z-index: 100;
+}
+
.karavan .rest-designer .rest-config-card:hover .delete-button,
.karavan .rest-designer .rest-card:hover .delete-button,
.karavan .rest-designer .method-card:hover .delete-button {
