From a4f816e75b5b82a58cf7fc7561658a766c342cce Mon Sep 17 00:00:00 2001
From: "m.epshtein" <m.epshtein@micord.ru>
Date: Mon, 16 Dec 2024 10:35:39 +0300
Subject: [PATCH 1/4] new css

---
 frontend/src/resources/css/components-eks.css | 9 +++++++++
 frontend/src/resources/css/style.css          | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/resources/css/components-eks.css

diff --git a/frontend/src/resources/css/components-eks.css b/frontend/src/resources/css/components-eks.css
new file mode 100644
index 0000000..cd1665b
--- /dev/null
+++ b/frontend/src/resources/css/components-eks.css
@@ -0,0 +1,9 @@
+.webbpm.ervu-eks .container-inside > div > div > [page-object]:first-child {
+    padding-top: 15px;
+}
+
+.webbpm.ervu-eks .container-inside > div > div > [page-object] {
+    display: inherit;
+    margin-bottom: 10px;
+    padding: 0 40px;
+}
\ No newline at end of file
diff --git a/frontend/src/resources/css/style.css b/frontend/src/resources/css/style.css
index d7d29b3..70f0b3c 100644
--- a/frontend/src/resources/css/style.css
+++ b/frontend/src/resources/css/style.css
@@ -7,4 +7,5 @@
 @import "../../../node_modules/@webbpm/base-package/css/style.css";
 @import "structure.css";
 @import "inbox-app.css";
-@import "components-app.css";
\ No newline at end of file
+@import "components-app.css";
+@import "components-eks.css";
\ No newline at end of file

From 503a3c556b02c162fd90ae2e11b52254487f93fb Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Thu, 13 Nov 2025 15:45:04 +0300
Subject: [PATCH 2/4] Update for next development version

---
 backend/pom.xml   | 2 +-
 frontend/pom.xml  | 2 +-
 pom.xml           | 2 +-
 resources/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 93015d7..efa74df 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>backend</artifactId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 2f36c9a..0c10585 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>
diff --git a/pom.xml b/pom.xml
index fe28c8d..1fb8d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>eks</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index d8413f0..8330c5d 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>

From 5869d0001ac8ca68db02489ce6771ea3f3c9bf0b Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Thu, 13 Nov 2025 16:26:04 +0300
Subject: [PATCH 3/4] Update develop to production version to avoid merge
 conflicts

---
 backend/pom.xml   | 2 +-
 frontend/pom.xml  | 2 +-
 pom.xml           | 2 +-
 resources/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 2eef11d..efa74df 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>backend</artifactId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index e8d9367..0c10585 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>
diff --git a/pom.xml b/pom.xml
index 445d8ef..1fb8d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>eks</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.1.1</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index 94ea280..8330c5d 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.1</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>

From 8769a418265bde84c70499ac14169c7e43a26c7d Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Thu, 13 Nov 2025 16:26:07 +0300
Subject: [PATCH 4/4] Update develop version back to pre-merge state

---
 backend/pom.xml   | 2 +-
 frontend/pom.xml  | 2 +-
 pom.xml           | 2 +-
 resources/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index efa74df..2eef11d 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>backend</artifactId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 0c10585..e8d9367 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>
diff --git a/pom.xml b/pom.xml
index 1fb8d30..445d8ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>eks</artifactId>
-  <version>1.1.1</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index 8330c5d..94ea280 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>