diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-20 17:26:53 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-20 17:26:53 +0300 |
commit | 039e9bffd4e29ad2f57130860e7eac04743d0d42 (patch) | |
tree | d3408b88af3c1938ba143311683f3cb2269f6cf2 /src/assets/styles/bmc | |
parent | afe4544e6d6fc71f516e261e83d241b41c2d0775 (diff) | |
parent | cdbc45c048d3283ae929e2bc764005584af9b90c (diff) | |
download | webui-vue-039e9bffd4e29ad2f57130860e7eac04743d0d42.tar.xz |
Merge branch 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui
Diffstat (limited to 'src/assets/styles/bmc')
-rw-r--r-- | src/assets/styles/bmc/_sila/_base.scss | 5 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_forms.scss | 8 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_modal.scss | 2 |
3 files changed, 10 insertions, 5 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%; |