diff options
| author | Anna Tsyganova <ATSyganova@IBS.RU> | 2022-07-14 16:09:40 +0300 |
|---|---|---|
| committer | Anna Tsyganova <ATSyganova@IBS.RU> | 2022-07-14 16:09:40 +0300 |
| commit | 8d11a46d1b3babff59e84cf8f390735d9d47e765 (patch) | |
| tree | 038465395b1d8097cb371a4596ecfb88451ca2f0 | |
| parent | bd05f9f7d939bb7990b95e4e10eef414ea104a3b (diff) | |
| parent | 72fccd01e62b3e0498dd3697f3322212febc7b1d (diff) | |
| download | webui-vue-8d11a46d1b3babff59e84cf8f390735d9d47e765.tar.xz | |
Merge branch 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui
4 files changed, 12 insertions, 3 deletions
diff --git a/src/components/_sila/Global/FormFile.vue b/src/components/_sila/Global/FormFile.vue index cf713acf..30e4af1f 100644 --- a/src/components/_sila/Global/FormFile.vue +++ b/src/components/_sila/Global/FormFile.vue @@ -78,6 +78,15 @@ export default { return this.variant === 'secondary'; }, }, + watch: { + file() { + if (this.file) { + this.$bvModal.hide(`modal-${this.id}`); + } else { + this.$emit('input', this.file); + } + }, + }, }; </script> diff --git a/src/views/_sila/Logs/EventLogs/EventLogs.vue b/src/views/_sila/Logs/EventLogs/EventLogs.vue index 8e653ec7..adaa2e9e 100644 --- a/src/views/_sila/Logs/EventLogs/EventLogs.vue +++ b/src/views/_sila/Logs/EventLogs/EventLogs.vue @@ -1,5 +1,5 @@ <template> - <b-container fluid="xxl pt-0 m-0"> + <b-container fluid="xl"> <page-title /> <b-row class="align-items-start"> <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> diff --git a/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue index 441207ae..e05ef639 100644 --- a/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue +++ b/src/views/_sila/Logs/PostCodeLogs/PostCodeLogs.vue @@ -1,5 +1,5 @@ <template> - <b-container fluid="xxl pt-0 m-0"> + <b-container fluid="xl"> <page-title /> <b-row class="align-items-start"> <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> diff --git a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue index e3bce07b..4e315619 100644 --- a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue +++ b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue @@ -1,5 +1,5 @@ <template> - <b-container fluid class="m-0 p-0"> + <b-container fluid="xl"> <page-title :description="$t('pageFactoryReset.description')" /> <!-- Reset Form --> |