diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-08 12:23:04 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-08 12:23:04 +0300 |
commit | fec3022f369f7b61637fb6f97d4957d81b8a3d50 (patch) | |
tree | 6e6fd1782a15a1b966f10f6c6018f765402d8e3e /src/assets/styles/bmc | |
parent | 7e74f9412c80e5462798b2d9b62a12f570aa9c95 (diff) | |
parent | bf78f95baa9f6a1c190d1bc0907acbcb2c76c00b (diff) | |
download | webui-vue-fec3022f369f7b61637fb6f97d4957d81b8a3d50.tar.xz |
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
Diffstat (limited to 'src/assets/styles/bmc')
-rw-r--r-- | src/assets/styles/bmc/_sila/_forms.scss | 58 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_pagination.scss | 5 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_tables.scss | 35 |
3 files changed, 49 insertions, 49 deletions
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss index 6ef725d2..1539c96a 100644 --- a/src/assets/styles/bmc/_sila/_forms.scss +++ b/src/assets/styles/bmc/_sila/_forms.scss @@ -14,30 +14,60 @@ line-height: $form-line-height; } -.form-group { +div:not(.search-global) > .form-group { margin-bottom: $spacer * 2; position: relative; - & > div > .input-group { + & .input-group, + .input-password-toggle-container { 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 + div > small { + position: absolute; + right: 10px; + top: 0; + font-size: x-small; + } + & .form-control, + .input-group-prepend, + .input-group-text, + .custom-select { + margin: -28px 0 0 0; + padding-top: 28px; + height: 56px; + &:focus { + z-index: unset; + position: initial; } } + & .custom-select { + background-color: $gray-5; + border: none; + } + & .input-group-text { + border: none; + background-color: $gray-5; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + & .input-group-prepend + input { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + position: initial; + } + & .btn-datepicker { + top: 12px; + } + & .input-action-btn { + top: 12px; + } & > label { position: relative; color: $text-tretiatry; margin-left: 10px; margin-bottom: $spacer / 4; + & span { + font-size: smaller; + } } } diff --git a/src/assets/styles/bmc/_sila/_pagination.scss b/src/assets/styles/bmc/_sila/_pagination.scss index 97fe0132..8183057e 100644 --- a/src/assets/styles/bmc/_sila/_pagination.scss +++ b/src/assets/styles/bmc/_sila/_pagination.scss @@ -4,6 +4,11 @@ justify-content: flex-end; select { width: fit-content; + margin: auto !important; + padding-top: 5px !important; + height: auto !important; + background-color: inherit !important; + border: 1px solid $gray-20 !important; } label { margin-left: $spacer; diff --git a/src/assets/styles/bmc/_sila/_tables.scss b/src/assets/styles/bmc/_sila/_tables.scss index bddb4d1d..1a1e5eba 100644 --- a/src/assets/styles/bmc/_sila/_tables.scss +++ b/src/assets/styles/bmc/_sila/_tables.scss @@ -267,41 +267,6 @@ } } -.table-full { - border-left: none; - border-right: none; - border-radius: 0; - border-top: 1px solid $gray-30; - - thead th { - border-bottom: 1px solid $gray-30; - border: none; - &:first-child { - border-radius: 0; - } - &:last-child { - border-radius: 0; - } - } -} - -.full-table-container { - & > [class*="table-responsive-"] { - overflow: auto; - width: calc(100vw - 280px); - margin-left: -1.97rem; - margin-right: -1.95rem; - border-radius: 0; - @include media-breakpoint-down(lg) { - margin-left: -2.2rem; - } - @include media-breakpoint-down(md) { - margin-left: -1.2rem; - width: 100vw; - } - } -} - .item-color { display: inline-block; width: 8px; |