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

4 files changed, 15 insertions, 10 deletions

diff --git a/src/assets/styles/bmc/_sila/_base.scss b/src/assets/styles/bmc/_sila/_base.scss
index 6a8ead73..e95a1ce1 100644
--- a/src/assets/styles/bmc/_sila/_base.scss
+++ b/src/assets/styles/bmc/_sila/_base.scss
@@ -63,13 +63,12 @@ h5,
 }
 
 h6,
-.h6 {
+.h6, label {
   font-size: 0.825rem !important;
   font-weight: 500;
   line-height: 1.2;
 }
 
-
 .navbar-brand {
   font-size: 1.4rem !important;
 }
@@ -92,9 +91,11 @@ h6,
 .app-header .navbar-text, .app-header .nav-link, .app-header .btn-link {
   &:hover {
     background-color: $red-40 !important;
+    border-radius: $border-radius;
   }
   &:active {
     background-color: $red-active !important;
+    border-radius: $border-radius;
   }
   &:focus {
     outline: 0;
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index f0de774e..2d8c0e14 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -16,6 +16,10 @@
 
 .form-group {
   margin-bottom: $spacer * 2;
+  & > label {
+    color: $text-tretiatry;
+    margin-bottom: $spacer / 4;
+  }
 }
 
 .custom-select,
@@ -110,8 +114,8 @@
 .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after,
 .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before,
 .custom-control-input:checked ~ .custom-control-label::before  {
-  border: 1px solid $red;
-  background-color: $red;
+  border: 1px solid $red !important;
+  background-color: $red !important;
   box-shadow: 0px 0px 0px 3px $white inset;
   cursor: pointer;
   &:focus {
diff --git a/src/assets/styles/bmc/_sila/_modal.scss b/src/assets/styles/bmc/_sila/_modal.scss
index 91412338..5f40d5e1 100644
--- a/src/assets/styles/bmc/_sila/_modal.scss
+++ b/src/assets/styles/bmc/_sila/_modal.scss
@@ -42,7 +42,7 @@
 
   .custom-file-input ~ .custom-file-label {
     background-color: transparent;
-  border: 1px dashed rgba(12, 28, 41, 0.6);
+  border: 1px dashed $text-tretiatry;
   box-sizing: border-box;
   border-radius: $border-radius;
   height: 100%;
diff --git a/src/env/assets/styles/_sila.scss b/src/env/assets/styles/_sila.scss
index 0b234461..e54fcb58 100644
--- a/src/env/assets/styles/_sila.scss
+++ b/src/env/assets/styles/_sila.scss
@@ -79,12 +79,12 @@ $surface-secondary: #F3F4F5;
 $on-surface-secondary: #040a0f99;
 $on-surface-tretiatry: #040A0F4D;
 
-$text-primary: #0C1C29;
-$text-secondary: #0C1C29E5;
-$text-tretiatry: #0c1c2999;
-$text-quaternary: #0c1c294d;
+$text-primary: rgb(12, 28, 41);
+$text-secondary: rgba(12, 28, 41, 0.8);
+$text-tretiatry: rgba(12, 28, 41, 0.6);
+$text-quaternary: rgba(12, 28, 41, 0.3);
 
-$login-page-description-color: #0c1c2999;
+$login-page-description-color: rgba(12, 28, 41, 0.6);
 
 $border-radius: 8px;