Skip to content

Commit 67eddd7

Browse files
Fix allignment on layout on right panel (#8060)
1 parent bd52fa8 commit 67eddd7

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

ui/src/components/view/SearchView.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -699,12 +699,6 @@ export default {
699699
right: 0;
700700
}
701701
}
702-
703-
:deep(.ant-input-group) {
704-
.ant-input-affix-wrapper {
705-
width: calc(100% - 10px);
706-
}
707-
}
708702
}
709703
710704
.filter-button {

ui/src/views/AutogenView.vue

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,6 @@
3232
<template #icon><reload-outlined /></template>
3333
{{ $t('label.refresh') }}
3434
</a-button>
35-
<a-switch
36-
v-if="!dataView && ['vm', 'volume', 'zone', 'cluster', 'host', 'storagepool', 'managementserver'].includes($route.name)"
37-
style="margin-left: 8px; margin-bottom: 3px"
38-
:checked-children="$t('label.metrics')"
39-
:un-checked-children="$t('label.metrics')"
40-
:checked="$store.getters.metrics"
41-
@change="(checked, event) => { $store.dispatch('SetMetrics', checked) }"/>
42-
<a-switch
43-
v-if="!projectView && hasProjectId"
44-
style="margin-left: 8px; margin-bottom: 3px"
45-
:checked-children="$t('label.projects')"
46-
:un-checked-children="$t('label.projects')"
47-
:checked="$store.getters.listAllProjects"
48-
@change="(checked, event) => { $store.dispatch('SetListAllProjects', checked) }"/>
4935
<a-tooltip placement="right">
5036
<template #title>
5137
{{ $t('label.filterby') }}
@@ -54,7 +40,8 @@
5440
v-if="!dataView && filters && filters.length > 0"
5541
:placeholder="$t('label.filterby')"
5642
:value="filterValue"
57-
style="min-width: 120px; margin-left: 10px; margin-top: -4px"
43+
style="min-width: 100px; margin-left: 10px; margin-bottom: 5px"
44+
size=small
5845
@change="changeFilter"
5946
showSearch
6047
optionFilterProp="label"
@@ -79,16 +66,30 @@
7966
</a-select-option>
8067
</a-select>
8168
</a-tooltip>
69+
<a-switch
70+
v-if="!dataView && ['vm', 'volume', 'zone', 'cluster', 'host', 'storagepool', 'managementserver'].includes($route.name)"
71+
style="margin-left: 8px; min-height: 23px; margin-bottom: 4px"
72+
:checked-children="$t('label.metrics')"
73+
:un-checked-children="$t('label.metrics')"
74+
:checked="$store.getters.metrics"
75+
@change="(checked, event) => { $store.dispatch('SetMetrics', checked) }"/>
76+
<a-switch
77+
v-if="!projectView && hasProjectId"
78+
style="margin-left: 8px; min-height: 23px; margin-bottom: 4px"
79+
:checked-children="$t('label.projects')"
80+
:un-checked-children="$t('label.projects')"
81+
:checked="$store.getters.listAllProjects"
82+
@change="(checked, event) => { $store.dispatch('SetListAllProjects', checked) }"/>
8283
</template>
8384
</breadcrumb>
8485
</a-col>
8586
<a-col
8687
:span="device === 'mobile' ? 24 : 12"
87-
:style="device === 'mobile' ? { float: 'right', 'margin-top': '12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right', display: 'table', 'margin-bottom': '-4px' }" >
88+
:style="device === 'mobile' ? { float: 'right', 'margin-top': '12px', 'margin-bottom': '-6px', display: 'table' } : { float: 'right', display: 'table', 'margin-top': '6px' }" >
8889
<slot name="action" v-if="dataView && $route.path.startsWith('/publicip')"></slot>
8990
<action-button
9091
v-else
91-
:style="dataView ? { float: device === 'mobile' ? 'left' : 'right' } : { 'margin-right': '10px', display: getStyle(), padding: '5px' }"
92+
:style="dataView ? { float: device === 'mobile' ? 'left' : 'right' } : { 'margin-right': '10px', display: getStyle() }"
9293
:loading="loading"
9394
:actions="actions"
9495
:selectedRowKeys="selectedRowKeys"
@@ -99,7 +100,6 @@
99100
<search-view
100101
v-if="!dataView"
101102
:searchFilters="searchFilters"
102-
style="min-width: 120px; margin-left: 10px; margin-top: 5px"
103103
:searchParams="searchParams"
104104
:apiName="apiName"
105105
@search="onSearch"
@@ -1966,6 +1966,12 @@ export default {
19661966
vertical-align: text-bottom;
19671967
}
19681968
1969+
:deep(.ant-switch-inner) {
1970+
display: block;
1971+
font-size: 14px;
1972+
margin: 0px 14px 0px 28px;
1973+
}
1974+
19691975
:deep(.ant-alert-message) {
19701976
display: flex;
19711977
align-items: center;

0 commit comments

Comments
 (0)