From 6ff22926a624a4935d0d5df6cc95ab9086dde873 Mon Sep 17 00:00:00 2001
From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
Date: Wed, 22 Jun 2022 13:01:00 +0300
Subject: WEBUI: ButtonBackToTop alignment; responsive tables overflow

---
 .../0005-AppLayout-refresh-UI-on-time.patch        | 25 --------------
 .../webui-vue/0005-ButtonBackToTop-alignment.patch | 40 ++++++++++++++++++++++
 .../0006-AppLayout-refresh-UI-on-time.patch        | 25 ++++++++++++++
 .../recipes-phosphor/webui/webui-vue_%.bbappend    |  5 +--
 4 files changed, 68 insertions(+), 27 deletions(-)
 delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-AppLayout-refresh-UI-on-time.patch
 create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch
 create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-AppLayout-refresh-UI-on-time.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-AppLayout-refresh-UI-on-time.patch
deleted file mode 100644
index 8ae2342734..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-AppLayout-refresh-UI-on-time.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dde98ca4147da6e3df0dee55a3161573993f00cb Mon Sep 17 00:00:00 2001
-From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Tue, 14 Jun 2022 08:09:34 +0300
-Subject: [PATCH] AppLayout: refresh UI on time
-
----
- src/layouts/AppLayout.vue | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
-index 0b78e5b1..c0bfff26 100644
---- a/src/layouts/AppLayout.vue
-+++ b/src/layouts/AppLayout.vue
-@@ -3,7 +3,7 @@
-     <app-header
-       ref="focusTarget"
-       class="app-header"
--      :router-key="routerKey"
-+      :key="routerKey"
-       @refresh="refresh"
-     />
-     <app-navigation class="app-navigation" />
--- 
-2.35.1
-
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch
new file mode 100644
index 0000000000..1cd3147ce8
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0005-ButtonBackToTop-alignment.patch
@@ -0,0 +1,40 @@
+From 47310669da5de88f9beef863aa944240f84a4ecf Mon Sep 17 00:00:00 2001
+From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
+Date: Wed, 22 Jun 2022 11:46:27 +0300
+Subject: [PATCH] ButtonBackToTop alignment
+
+---
+ src/components/Global/ButtonBackToTop.vue | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/components/Global/ButtonBackToTop.vue b/src/components/Global/ButtonBackToTop.vue
+index 9160c7b7..26c3688b 100644
+--- a/src/components/Global/ButtonBackToTop.vue
++++ b/src/components/Global/ButtonBackToTop.vue
+@@ -47,8 +47,8 @@ export default {
+ <style lang="scss" scoped>
+ .btn-top {
+   position: fixed;
+-  bottom: 24px;
+-  right: 24px;
++  bottom: $spacer;
++  right: $spacer * 2;
+ 
+   box-shadow: $box-shadow;
+   visibility: hidden;
+@@ -56,9 +56,9 @@ export default {
+   transition: $transition-base;
+   z-index: $zindex-fixed;
+ 
+-  @media (min-width: 1600px) {
+-    left: 1485px;
+-    right: auto;
++  @include media-breakpoint-up($responsive-layout-bp) {
++    left: auto;
++    right: $spacer * 3;
+   }
+ }
+ .show-btn {
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch
new file mode 100644
index 0000000000..8ae2342734
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0006-AppLayout-refresh-UI-on-time.patch
@@ -0,0 +1,25 @@
+From dde98ca4147da6e3df0dee55a3161573993f00cb Mon Sep 17 00:00:00 2001
+From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
+Date: Tue, 14 Jun 2022 08:09:34 +0300
+Subject: [PATCH] AppLayout: refresh UI on time
+
+---
+ src/layouts/AppLayout.vue | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
+index 0b78e5b1..c0bfff26 100644
+--- a/src/layouts/AppLayout.vue
++++ b/src/layouts/AppLayout.vue
+@@ -3,7 +3,7 @@
+     <app-header
+       ref="focusTarget"
+       class="app-header"
+-      :router-key="routerKey"
++      :key="routerKey"
+       @refresh="refresh"
+     />
+     <app-navigation class="app-navigation" />
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
index bf7630b894..428b55e6ea 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 SRC_URI = "git://git@git.sila.ru/srv/pub/scm/git/openbmc/webui-vue.git;branch=sila;protocol=ssh"
-SRCREV  = "2eb8233d355b9677bfe47fd08656c355722ed024"
+SRCREV  = "ce43d5ca9bc408c40c3c10d936110d9ee7db35f0"
 
 SRC_URI += "\
     file://favicon.ico \
@@ -19,7 +19,8 @@ SRC_URI += "\
     file://0002-Login-languages-list.patch \
     file://0003-GlobalStore-Trim-assetTag-and-serialNumber.patch \
     file://0004-main-padding-right-when-media-gt-992px.patch \
-    file://0005-AppLayout-refresh-UI-on-time.patch \
+    file://0005-ButtonBackToTop-alignment.patch \
+    file://0006-AppLayout-refresh-UI-on-time.patch \
     "
 
 do_update_logo () {
-- 
cgit v1.2.3