diff options
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch')
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch | 101 |
1 files changed, 58 insertions, 43 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch index 49c76fe928..6039c71dca 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0010-virtual-media-layout-and-styles.patch @@ -1,17 +1,17 @@ -From 0d00cabf1c7ddd8021ca71efb83545112aab055e Mon Sep 17 00:00:00 2001 +From ed8b6c17c671cc8bf3e7b0c1c70cbdbc2fca6647 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" <AKosteltsev@IBS.RU> -Date: Sat, 25 Jun 2022 00:39:23 +0300 -Subject: [PATCH] virtual-media: layout and styles +Date: Sun, 26 Jun 2022 12:10:08 +0300 +Subject: [PATCH 1/2] virtual-media: layout and styles --- src/assets/styles/bmc/custom/_index.scss | 3 +- - .../styles/bmc/custom/_virtual-media.scss | 36 +++++ - .../Operations/VirtualMedia/VirtualMedia.vue | 126 ++++++++++-------- - 3 files changed, 106 insertions(+), 59 deletions(-) - create mode 100644 src/assets/styles/bmc/custom/_virtual-media.scss + .../styles/bmc/custom/ibs/_virtual-media.scss | 47 +++++++ + .../Operations/VirtualMedia/VirtualMedia.vue | 130 ++++++++++-------- + 3 files changed, 121 insertions(+), 59 deletions(-) + create mode 100644 src/assets/styles/bmc/custom/ibs/_virtual-media.scss diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss -index 74594e35..eb466c4b 100644 +index 74594e35..bc05a82a 100644 --- a/src/assets/styles/bmc/custom/_index.scss +++ b/src/assets/styles/bmc/custom/_index.scss @@ -15,4 +15,5 @@ @@ -21,13 +21,13 @@ index 74594e35..eb466c4b 100644 -@import "./toasts"; \ No newline at end of file +@import "./toasts"; -+@import "./virtual-media"; -diff --git a/src/assets/styles/bmc/custom/_virtual-media.scss b/src/assets/styles/bmc/custom/_virtual-media.scss ++@import "./ibs/virtual-media"; +diff --git a/src/assets/styles/bmc/custom/ibs/_virtual-media.scss b/src/assets/styles/bmc/custom/ibs/_virtual-media.scss new file mode 100644 -index 00000000..b040fbaa +index 00000000..865a3c39 --- /dev/null -+++ b/src/assets/styles/bmc/custom/_virtual-media.scss -@@ -0,0 +1,36 @@ ++++ b/src/assets/styles/bmc/custom/ibs/_virtual-media.scss +@@ -0,0 +1,47 @@ + +// +// Media @@ -52,20 +52,31 @@ index 00000000..b040fbaa +// +// Media Legacy +// ++.media-legacy label { ++ margin-top: $spacer * 2; ++} ++ +.media-legacy-buttons-group { -+ display: inline-grid; ++ margin: 0px; ++} ++ ++.media-legacy-buttons-group .btn { ++ width: 100%; +} + -+.media-legacy-buttons-group > button { ++.media-legacy-buttons-group > .media-legacy-configure { ++ display: block; ++ width: 50%; + margin-bottom: $spacer * 2; +} + -+.media-legacy > div { -+ margin-top: $spacer * 2; ++.media-legacy-buttons-group > .media-legacy-start { ++ display: inline-block; ++ width: 50%; + margin-bottom: - $spacer * 2; +} diff --git a/src/views/Operations/VirtualMedia/VirtualMedia.vue b/src/views/Operations/VirtualMedia/VirtualMedia.vue -index 8a3d5add..19f425d9 100644 +index 8a3d5add..fc8369d4 100644 --- a/src/views/Operations/VirtualMedia/VirtualMedia.vue +++ b/src/views/Operations/VirtualMedia/VirtualMedia.vue @@ -8,35 +8,41 @@ @@ -139,7 +150,7 @@ index 8a3d5add..19f425d9 100644 </b-col> </b-row> </page-section> -@@ -53,37 +59,41 @@ +@@ -53,37 +59,45 @@ :key="$index" md="6" > @@ -161,13 +172,15 @@ index 8a3d5add..19f425d9 100644 - {{ $t('pageVirtualMedia.configureConnection') }} - </b-button> + <div class="media-legacy-buttons-group"> -+ <b-button -+ variant="primary" -+ :disabled="device.isActive" -+ @click="configureConnection(device)" -+ > -+ {{ $t('pageVirtualMedia.configureConnection') }} -+ </b-button> ++ <div class="media-legacy-configure"> ++ <b-button ++ variant="primary" ++ :disabled="device.isActive" ++ @click="configureConnection(device)" ++ > ++ {{ $t('pageVirtualMedia.configureConnection') }} ++ </b-button> ++ </div> - <b-button - v-if="!device.isActive" @@ -187,23 +200,25 @@ index 8a3d5add..19f425d9 100644 - {{ $t('pageVirtualMedia.stop') }} - </b-button> - </b-form-group> -+ <b-button -+ v-if="!device.isActive" -+ variant="primary" -+ class="float-right" -+ :disabled="!device.serverUri" -+ @click="startLegacy(device)" -+ > -+ {{ $t('pageVirtualMedia.start') }} -+ </b-button> -+ <b-button -+ v-if="device.isActive" -+ variant="primary" -+ class="float-right" -+ @click="stopLegacy(device)" -+ > -+ {{ $t('pageVirtualMedia.stop') }} -+ </b-button> ++ <div class="media-legacy-start"> ++ <b-button ++ v-if="!device.isActive" ++ variant="primary" ++ class="float-right" ++ :disabled="!device.serverUri" ++ @click="startLegacy(device)" ++ > ++ {{ $t('pageVirtualMedia.start') }} ++ </b-button> ++ <b-button ++ v-if="device.isActive" ++ variant="primary" ++ class="float-right" ++ @click="stopLegacy(device)" ++ > ++ {{ $t('pageVirtualMedia.stop') }} ++ </b-button> ++ </div> + </div> + </b-form-group> + </div> |