diff options
author | Цыганова Анна Федоровна <ATSyganova@ibs.root.ibscorp.ru> | 2022-06-07 11:51:12 +0300 |
---|---|---|
committer | Цыганова Анна Федоровна <ATSyganova@ibs.root.ibscorp.ru> | 2022-06-07 11:51:12 +0300 |
commit | d6d339de0078789cdef367f96c4ea3580e6257e7 (patch) | |
tree | c4ab6c1a355507af459709ca82a05d1299bdb130 /src | |
parent | a4dcc4486cba71cd751327184a6651ebcba4e935 (diff) | |
parent | 1b8d6d756c9dff14d3dd8298ecae7d6fe73192e5 (diff) | |
download | webui-vue-d6d339de0078789cdef367f96c4ea3580e6257e7.tar.xz |
Merge branch 'sila-dev' of git.sila.ru:pub/openbmc/webui-vue into sila-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/assets/styles/bmc/custom/_buttons.scss | 5 | ||||
-rw-r--r-- | src/components/AppHeader/AppHeader.vue | 2 | ||||
-rw-r--r-- | src/components/Global/PageContainer.vue | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss index d9c929db..26a11dbd 100644 --- a/src/assets/styles/bmc/custom/_buttons.scss +++ b/src/assets/styles/bmc/custom/_buttons.scss @@ -18,6 +18,11 @@ height: 36px; } +.btn-lg { + width: 270px; + height: 36px; +} + .btn-primary { background-color: $red-brand-primary; border-radius: 8px; diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index 939ec5af..81287163 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -112,7 +112,7 @@ <status-icon :status="serverStatusIcon" /> {{ $t('appHeader.power') }} </b-nav-item> - <div class="nav-item header-clock__icon"> + <div class="nav-item"> <b-button id="app-header-refresh" variant="link" diff --git a/src/components/Global/PageContainer.vue b/src/components/Global/PageContainer.vue index 71df8fae..40c17ac7 100644 --- a/src/components/Global/PageContainer.vue +++ b/src/components/Global/PageContainer.vue @@ -1,5 +1,5 @@ <template> - <main id="main-content" class="page-container"> + <main id="main-content" class="page-container scroll-container"> <slot /> </main> </template> @@ -19,7 +19,6 @@ export default { <style lang="scss" scoped> main { width: 100%; - height: 100%; &:focus-visible { box-shadow: inset 0 0 0 2px theme-color('primary'); |