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

6 files changed, 34 insertions, 16 deletions

diff --git a/src/assets/images/_sila/built-on-openbmc-logo.svg b/src/assets/images/_sila/built-on-openbmc-logo.svg
index 8e4ea86d..e46dbb0e 100644
--- a/src/assets/images/_sila/built-on-openbmc-logo.svg
+++ b/src/assets/images/_sila/built-on-openbmc-logo.svg
@@ -1,5 +1,5 @@
 <svg width="480" height="900" viewBox="0 0 480 900" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <rect width="480" height="900" fill="url(#pattern0)"/>
-<rect width="480" height="900" fill="#1A3E5B" fill-opacity="0.85"/>
+<rect width="480" height="900" fill="#2c405a"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M178.44 441.619V434H138.073C133.615 434 130 437.639 130 442.127V457.873C130 462.361 133.615 466 138.073 466H178.44V456.857H144.128C142.178 456.857 140.596 455.265 140.596 453.302V445.175C140.596 443.211 142.178 441.619 144.128 441.619H178.44ZM188.028 466V434H204.679V441.619H199.128V457.873L224.358 434H238.991V466H228.394V442.127L203.67 466H188.028ZM253.624 434V441.619H257.156V442.127L244.794 466H255.138L267.752 441.619H271.789L284.404 466H295.505L278.853 434H253.624ZM308.119 441.619V434H332.844L350 466H338.395L336.376 461.937H311.147L309.128 466H299.037L311.147 442.127V441.619H308.119ZM315.688 452.794V454.317H332.339V452.794L325.78 441.619H321.743L315.688 452.794Z" fill="#E11717"/>
 </svg>
diff --git a/src/assets/styles/bmc/_sila/pages/_login.scss b/src/assets/styles/bmc/_sila/pages/_login.scss
index cd7ef538..e3abde78 100644
--- a/src/assets/styles/bmc/_sila/pages/_login.scss
+++ b/src/assets/styles/bmc/_sila/pages/_login.scss
@@ -8,7 +8,31 @@
 
 .login-form > .btn-primary {
   width: 100%;
-  margin-top: 2rem !important;
+  margin-top: 0.5rem !important;
+}
+
+.login-form > .form-group {
+  margin-bottom: 1.5rem;
+  display: flow-root;
+}
+  
+.login-form > .form-group > div > input,
+.login-form > .form-group > div > select, 
+.input-password-toggle-container > input {
+  margin: -28px 0 0 0;
+  padding-top: 28px;
+  height: 56px; 
+}
+
+.login-form > .form-group  > label,
+.login-form__section > label {
+  margin-left: 10px;
+  margin-bottom: 0.25rem;
+  color: $text-tretiatry 
+}
+
+.login-main > h1 {
+  font-weight: bold;
 }
 
 .login-main .h3 {
diff --git a/src/layouts/_sila/LoginLayout.vue b/src/layouts/_sila/LoginLayout.vue
index 8f4b3189..f353a4bc 100644
--- a/src/layouts/_sila/LoginLayout.vue
+++ b/src/layouts/_sila/LoginLayout.vue
@@ -8,9 +8,8 @@
         />
       </div>
       <div class="login-main">
-        <h1 v-if="customizableGuiName" class="h3 mb-5">
-          {{ customizableGuiName }}
-        </h1>
+        <h1>{{ $t('pageLogin.auth') }}</h1>
+        <h3 class="h5 mb-4">{{ $t('pageLogin.authDescription') }}</h3>
         <router-view class="login=form form-background" />
       </div>
     </div>
@@ -20,12 +19,6 @@
 <script>
 export default {
   name: 'LoginLayout',
-  data() {
-    return {
-      altLogo: process.env.VUE_APP_COMPANY_NAME || 'BMC',
-      customizableGuiName: process.env.VUE_APP_GUI_NAME || '',
-    };
-  },
 };
 </script>
 
@@ -50,8 +43,9 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center;
+  align-items: flex-start;
   min-height: 100vh;
+  width: 30vw;
   margin: auto;
   padding: 0;
 }
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 5fdd803e..7494318f 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -609,6 +609,8 @@
     }
   },
   "pageLogin": {
+    "auth": "Authorization",
+    "authDescription": "Enter your login information",
     "language": "Language",
     "logIn": "Log in",
     "password": "Password",
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index c0ee630a..6c5bff0b 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -617,6 +617,8 @@
     }
   },
   "pageLogin": {
+    "auth": "Авторизация",
+    "authDescription": "Введите данные для входа в систему",
     "language": "Язык",
     "logIn": "Войти",
     "password": "Пароль",
diff --git a/src/views/_sila/Login/Login.vue b/src/views/_sila/Login/Login.vue
index 3c330362..e11f3468 100644
--- a/src/views/_sila/Login/Login.vue
+++ b/src/views/_sila/Login/Login.vue
@@ -87,10 +87,6 @@ export default {
           text: 'English',
         },
         {
-          value: 'es',
-          text: 'Español',
-        },
-        {
           value: 'ru-RU',
           text: 'Русский',
         },