Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila

2 files changed, 38 insertions, 19 deletions

diff --git a/src/assets/styles/bmc/_sila/_buttons.scss b/src/assets/styles/bmc/_sila/_buttons.scss
index 0754e011..f31a8657 100644
--- a/src/assets/styles/bmc/_sila/_buttons.scss
+++ b/src/assets/styles/bmc/_sila/_buttons.scss
@@ -54,7 +54,7 @@
   box-shadow: 1px 2px 4px -1px rgb(79 37 37 / 10%) inset;
   &:hover {
     background-color: $gray-5-hover;
-      color: $red;
+    color: $red;
   }
   &:focus {
     border: none;
@@ -178,25 +178,25 @@
 }
 
 .btn-collapse {
-    height: 56px;
-    width: 100%;
-    border-bottom: 1px solid $gray-10;
-    gap: 8px;
-    &:active,
-    &:focus {
-      box-shadow: none;
-    }
-    &:hover {
-      color: $text-primary;
-    }
+  height: 56px;
+  width: 100%;
+  border-bottom: 1px solid $gray-10;
+  gap: 8px;
+  &:active,
+  &:focus {
+    box-shadow: none;
+  }
+  &:hover {
+    color: $text-primary;
+  }
+  .icon-expand {
+    margin-left: auto;
+    transition: 0.3s linear;
+  }
+  &.collapsed {
     .icon-expand {
-      margin-left: auto;
+      transform: rotate(180deg);
       transition: 0.3s linear;
     }
-    &.collapsed {
-      .icon-expand {
-        transform: rotate(180deg);
-        transition: 0.3s linear;
-      }
-    }
+  }
 }
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 7a0a703a..6ef725d2 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -16,8 +16,27 @@
 
 .form-group {
   margin-bottom: $spacer * 2;
+  position: relative;
+  & > div > .input-group {
+    position: initial;
+    & > .form-control-with-button {
+      margin: -28px 0 0 0;
+      padding-top: 28px;
+      height: 56px;
+      &:focus {
+        z-index: unset;
+        position: initial;
+      }
+    }
+    & > .input-action-btn,
+    .btn-datepicker {
+      top: 12px;
+    }
+  }
   & > label {
+    position: relative;
     color: $text-tretiatry;
+    margin-left: 10px;
     margin-bottom: $spacer / 4;
   }
 }