WEBUI: Logs search alignment; Headers size

4 files changed, 83 insertions, 27 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch
new file mode 100644
index 0000000000..185a21b78d
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0015-Logs-search-alignment.patch
@@ -0,0 +1,43 @@
+From 192689b1ea1604ce9a9f42640afd0fb41af7cb76 Mon Sep 17 00:00:00 2001
+From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
+Date: Tue, 28 Jun 2022 19:35:57 +0300
+Subject: [PATCH] Logs: search alignment
+
+---
+ src/views/Logs/EventLogs/EventLogs.vue       | 4 ++--
+ src/views/Logs/PostCodeLogs/PostCodeLogs.vue | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/views/Logs/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue
+index 5b8ca110..e7fc507b 100644
+--- a/src/views/Logs/EventLogs/EventLogs.vue
++++ b/src/views/Logs/EventLogs/EventLogs.vue
+@@ -1,8 +1,8 @@
+ <template>
+   <b-container fluid="xl">
+     <page-title />
+-    <b-row class="align-items-start">
+-      <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4">
++    <b-row class="align-items-end">
++      <b-col sm="8" xl="6" class="d-sm-flex align-items-end">
+         <search
+           :placeholder="$t('pageEventLogs.table.searchLogs')"
+           data-test-id="eventLogs-input-searchLogs"
+diff --git a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
+index d116d2ed..ea3d54ab 100644
+--- a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
++++ b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
+@@ -1,8 +1,8 @@
+ <template>
+   <b-container fluid="xl">
+     <page-title />
+-    <b-row class="align-items-start">
+-      <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4">
++    <b-row class="align-items-end">
++      <b-col sm="8" xl="6" class="d-sm-flex align-items-end">
+         <search
+           :placeholder="$t('pagePostCodeLogs.table.searchLogs')"
+           @change-search="onChangeSearchInput"
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch
index a97a4f0510..2498145552 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0072-IBS-custom-styles-_base.scss.patch
@@ -1,14 +1,14 @@
-From bf9a66d5b998b439399e15feb957fbb90212011b Mon Sep 17 00:00:00 2001
+From 6198794ce96561b30e95dc28c2d2fa43d8bd1fe8 Mon Sep 17 00:00:00 2001
 From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Tue, 28 Jun 2022 04:17:24 +0300
+Date: Tue, 28 Jun 2022 19:52:22 +0300
 Subject: [PATCH] IBS: custom styles _base.scss
 
 ---
- src/assets/styles/bmc/custom/_base.scss | 52 +++++++++++++++++--------
- 1 file changed, 36 insertions(+), 16 deletions(-)
+ src/assets/styles/bmc/custom/_base.scss | 64 ++++++++++++++++---------
+ 1 file changed, 42 insertions(+), 22 deletions(-)
 
 diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss
-index c11e046c..ae59da51 100644
+index c11e046c..53be0328 100644
 --- a/src/assets/styles/bmc/custom/_base.scss
 +++ b/src/assets/styles/bmc/custom/_base.scss
 @@ -1,50 +1,70 @@
@@ -25,51 +25,57 @@ index c11e046c..ae59da51 100644
  .h1 {
 -  font-size: 2.625rem;
 -  font-weight: 300;
-+  font-size: 1.75rem !important;
-+  font-weight: 700;
-   line-height: 1.238;
+-  line-height: 1.238;
++  font-size: 2.25rem !important;
++  font-weight: 500;
++  line-height: 1.2;
  }
  
  h2,
  .h2 {
 -  font-size: 2.25rem;
 -  font-weight: 300;
-+  font-size: 1.25rem !important;
+-  line-height: 1.3333;
++  font-size: 1.5rem !important;
 +  font-weight: 500;
-   line-height: 1.3333;
++  line-height: 1.2;
  }
  
  h3,
  .h3 {
 -  font-size: 1.75rem;
-+  font-size: 1rem !important;
++  font-size: 1.5rem !important;
    font-weight: 400;
-   line-height: 1.2857;
+-  line-height: 1.2857;
++  line-height: 1.2;
  }
  
  h4,
  .h4 {
 -  font-size: 1.25rem;
-+  font-size: 0.875rem !important;
++  font-size: 1.25rem !important;
    font-weight: 400;
-   line-height: 1.3;
+-  line-height: 1.3;
++  line-height: 1.2;
  }
  
  h5,
  .h5 {
 -  font-size: 1rem;
-+  font-size: 0.75rem !important;
++  font-size: 1rem !important;
    font-weight: 500;
-   line-height: 1.375;
+-  line-height: 1.375;
++  line-height: 1.2;
  }
  
  h6,
  .h6 {
 -  font-size: 0.875rem;
-+  font-size: 0.625rem !important;
++  font-size: 0.825rem !important;
    font-weight: 500;
-   line-height: 1.2857;
- }
+-  line-height: 1.2857;
++  line-height: 1.2;
++}
 +
 +
 +.nav-link--current{
@@ -97,7 +103,7 @@ index c11e046c..ae59da51 100644
 +  &:focus {
 +    outline: 0;
 +  }
-+}
+ }
 -- 
 2.35.1
 
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch
index ac995b68a5..e127b7a785 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0074-IBS-custom-styles-_card.scss.patch
@@ -1,17 +1,17 @@
-From 2825cb4e355a5ed1957b73990f58e6469a5070fa Mon Sep 17 00:00:00 2001
+From 8784edd8ef21fdd02fe3c6834d202515f578435b Mon Sep 17 00:00:00 2001
 From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU>
-Date: Mon, 27 Jun 2022 23:17:50 +0300
-Subject: [PATCH 4/7] IBS: custom styles _card.scss
+Date: Tue, 28 Jun 2022 19:54:48 +0300
+Subject: [PATCH] IBS: custom styles _card.scss
 
 ---
- src/assets/styles/bmc/custom/_card.scss | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
+ src/assets/styles/bmc/custom/_card.scss | 30 ++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/src/assets/styles/bmc/custom/_card.scss b/src/assets/styles/bmc/custom/_card.scss
-index 5f2a5962..34334687 100644
+index 5f2a5962..096dbc2a 100644
 --- a/src/assets/styles/bmc/custom/_card.scss
 +++ b/src/assets/styles/bmc/custom/_card.scss
-@@ -1,5 +1,27 @@
+@@ -1,5 +1,33 @@
  .card {
 +  border-radius: $border-radius;
    .bg-success {
@@ -41,6 +41,12 @@ index 5f2a5962..34334687 100644
 +    }
 +  }
 +}
++
++.card-buttons > a {
++  font-weight: 500;
++  font-size: .825rem;
++  vertical-align: baseline;
++}
 -- 
 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 5750a70eca..3fff92a59e 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
@@ -29,6 +29,7 @@ SRC_URI += "\
     file://0012-inventory-service-indicators.patch \
     file://0013-power-operations-boot-settings.patch \
     file://0014-security-ldap-settings.patch \
+    file://0015-Logs-search-alignment.patch \
     file://0071-IBS-custom-styles-_alert.scss.patch \
     file://0072-IBS-custom-styles-_base.scss.patch \
     file://0073-IBS-custom-styles-_buttons.scss.patch \