This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 67eddd7c0e1 Fix allignment on layout on right panel (#8060)
67eddd7c0e1 is described below
commit 67eddd7c0e1055031ee67886da3ce0921bb5ed34
Author: Harikrishna <[email protected]>
AuthorDate: Mon Oct 30 17:20:17 2023 +0530
Fix allignment on layout on right panel (#8060)
---
ui/src/components/view/SearchView.vue | 6 -----
ui/src/views/AutogenView.vue | 42 ++++++++++++++++++++---------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/ui/src/components/view/SearchView.vue
b/ui/src/components/view/SearchView.vue
index bce8a6bb9e5..f315667442a 100644
--- a/ui/src/components/view/SearchView.vue
+++ b/ui/src/components/view/SearchView.vue
@@ -699,12 +699,6 @@ export default {
right: 0;
}
}
-
- :deep(.ant-input-group) {
- .ant-input-affix-wrapper {
- width: calc(100% - 10px);
- }
- }
}
.filter-button {
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 278d4f8519d..c8d13e698b3 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -32,20 +32,6 @@
<template #icon><reload-outlined /></template>
{{ $t('label.refresh') }}
</a-button>
- <a-switch
- v-if="!dataView && ['vm', 'volume', 'zone', 'cluster',
'host', 'storagepool', 'managementserver'].includes($route.name)"
- style="margin-left: 8px; margin-bottom: 3px"
- :checked-children="$t('label.metrics')"
- :un-checked-children="$t('label.metrics')"
- :checked="$store.getters.metrics"
- @change="(checked, event) => { $store.dispatch('SetMetrics',
checked) }"/>
- <a-switch
- v-if="!projectView && hasProjectId"
- style="margin-left: 8px; margin-bottom: 3px"
- :checked-children="$t('label.projects')"
- :un-checked-children="$t('label.projects')"
- :checked="$store.getters.listAllProjects"
- @change="(checked, event) => {
$store.dispatch('SetListAllProjects', checked) }"/>
<a-tooltip placement="right">
<template #title>
{{ $t('label.filterby') }}
@@ -54,7 +40,8 @@
v-if="!dataView && filters && filters.length > 0"
:placeholder="$t('label.filterby')"
:value="filterValue"
- style="min-width: 120px; margin-left: 10px; margin-top:
-4px"
+ style="min-width: 100px; margin-left: 10px; margin-bottom:
5px"
+ size=small
@change="changeFilter"
showSearch
optionFilterProp="label"
@@ -79,16 +66,30 @@
</a-select-option>
</a-select>
</a-tooltip>
+ <a-switch
+ v-if="!dataView && ['vm', 'volume', 'zone', 'cluster',
'host', 'storagepool', 'managementserver'].includes($route.name)"
+ style="margin-left: 8px; min-height: 23px; margin-bottom:
4px"
+ :checked-children="$t('label.metrics')"
+ :un-checked-children="$t('label.metrics')"
+ :checked="$store.getters.metrics"
+ @change="(checked, event) => { $store.dispatch('SetMetrics',
checked) }"/>
+ <a-switch
+ v-if="!projectView && hasProjectId"
+ style="margin-left: 8px; min-height: 23px; margin-bottom:
4px"
+ :checked-children="$t('label.projects')"
+ :un-checked-children="$t('label.projects')"
+ :checked="$store.getters.listAllProjects"
+ @change="(checked, event) => {
$store.dispatch('SetListAllProjects', checked) }"/>
</template>
</breadcrumb>
</a-col>
<a-col
:span="device === 'mobile' ? 24 : 12"
- :style="device === 'mobile' ? { float: 'right', 'margin-top':
'12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right',
display: 'table', 'margin-bottom': '-4px' }" >
+ :style="device === 'mobile' ? { float: 'right', 'margin-top':
'12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right',
display: 'table', 'margin-top': '6px' }" >
<slot name="action" v-if="dataView &&
$route.path.startsWith('/publicip')"></slot>
<action-button
v-else
- :style="dataView ? { float: device === 'mobile' ? 'left' :
'right' } : { 'margin-right': '10px', display: getStyle(), padding: '5px' }"
+ :style="dataView ? { float: device === 'mobile' ? 'left' :
'right' } : { 'margin-right': '10px', display: getStyle() }"
:loading="loading"
:actions="actions"
:selectedRowKeys="selectedRowKeys"
@@ -99,7 +100,6 @@
<search-view
v-if="!dataView"
:searchFilters="searchFilters"
- style="min-width: 120px; margin-left: 10px; margin-top: 5px"
:searchParams="searchParams"
:apiName="apiName"
@search="onSearch"
@@ -1966,6 +1966,12 @@ export default {
vertical-align: text-bottom;
}
+:deep(.ant-switch-inner) {
+ display: block;
+ font-size: 14px;
+ margin: 0px 14px 0px 28px;
+}
+
:deep(.ant-alert-message) {
display: flex;
align-items: center;
