summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Lysak <v.lysak@dunice.net>2022-07-27 16:59:19 +0300
committerVitalii Lysak <v.lysak@dunice.net>2022-07-27 16:59:19 +0300
commit8fa8dc95f0b601c3afcae8aed65aae7a267b843b (patch)
tree76ec93497f51a82dcab8a3971bb714eda80d400a
parent681d748683a09e8b3f2e3f8faeb6a3184edc5f7b (diff)
parent42067fe8a8bc440227f982581bd6c8e76046dd34 (diff)
downloadwebui-vue-8fa8dc95f0b601c3afcae8aed65aae7a267b843b.tar.xz
Merge branch 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui
-rw-r--r--src/components/_sila/AppNavigation/AppNavigation.vue3
-rw-r--r--src/env/assets/styles/_sila.scss46
2 files changed, 27 insertions, 22 deletions
diff --git a/src/components/_sila/AppNavigation/AppNavigation.vue b/src/components/_sila/AppNavigation/AppNavigation.vue
index fc927c6e..063e401e 100644
--- a/src/components/_sila/AppNavigation/AppNavigation.vue
+++ b/src/components/_sila/AppNavigation/AppNavigation.vue
@@ -103,6 +103,9 @@ svg {
@include media-breakpoint-up($responsive-layout-bp) {
padding-top: $spacer;
}
+ & li:first-child {
+ border-top: 1px solid $gray-20;
+ }
}
.nav-item__nav {
diff --git a/src/env/assets/styles/_sila.scss b/src/env/assets/styles/_sila.scss
index e54fcb58..ba4c3223 100644
--- a/src/env/assets/styles/_sila.scss
+++ b/src/env/assets/styles/_sila.scss
@@ -1,43 +1,44 @@
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-ExtraLight.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-ExtraLight.woff2") format("woff2");
font-weight: 200;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-ExtraLightItalic.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-ExtraLightItalic.woff2")
+ format("woff2");
font-weight: 200;
font-style: italic;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-Light.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-Light.woff2") format("woff2");
font-weight: 300;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-Regular.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-Regular.woff2") format("woff2");
font-weight: 400;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-Italic.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-Italic.woff2") format("woff2");
font-weight: 400;
font-style: italic;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-Medium.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-Medium.woff2") format("woff2");
font-weight: 500;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-Bold.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-Bold.woff2") format("woff2");
font-weight: 700;
}
@font-face {
- font-family: 'Inter';
- src: url('~@/env/assets/fonts/Inter/Inter-BoldItalic.woff2') format('woff2');
+ font-family: "Inter";
+ src: url("~@/env/assets/fonts/Inter/Inter-BoldItalic.woff2") format("woff2");
font-weight: 700;
font-style: italic;
}
@@ -60,10 +61,10 @@ $warning: $yellow;
$dark-hover: #3c506a;
-$red-hover: #FC2A2A;
+$red-hover: #fc2a2a;
$red-active: #df2323;
-$red-disabled: #E17171;
-$red-click: #C71414;
+$red-disabled: #e17171;
+$red-click: #c71414;
$red-shadow: #e1171780;
$red-light-background: #e117170d;
@@ -73,11 +74,11 @@ $gray-5-hover: rgba(20, 39, 53, 0.1);
$gray-10: rgba(26, 62, 91, 0.1);
$gray-20: rgba(26, 62, 92, 0.2);
$gray-30: rgba(26, 62, 91, 0.3);
-$red-40:rgba(225, 23, 23, 0.4);
+$red-40: rgba(225, 23, 23, 0.4);
-$surface-secondary: #F3F4F5;
+$surface-secondary: #f3f4f5;
$on-surface-secondary: #040a0f99;
-$on-surface-tretiatry: #040A0F4D;
+$on-surface-tretiatry: #040a0f4d;
$text-primary: rgb(12, 28, 41);
$text-secondary: rgba(12, 28, 41, 0.8);
@@ -91,3 +92,4 @@ $border-radius: 8px;
$loading-color: #c11d1d;
$navbar-color: $dark;
$header-height: 56px;
+$navigation-width: 280px;