Skip to content

Commit ba0d52a

Browse files
committed
style: improve layout and alignment of input fields for better UX
1 parent b1ece1e commit ba0d52a

10 files changed

Lines changed: 82 additions & 75 deletions

File tree

spring-boot-admin-server-ui/src/main/frontend/views/applications/index.vue

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,52 +19,54 @@
1919
<sba-wave />
2020
<section>
2121
<sba-sticky-subnav>
22-
<div class="container mx-auto flex">
23-
<ApplicationStats />
24-
<sba-confirm-button
25-
class="mr-1"
26-
:title="$t('applications.actions.refresh_applications')"
27-
@click="refreshApplications"
28-
>
29-
<font-awesome-icon :icon="'rotate-left'" />
30-
</sba-confirm-button>
31-
<template v-if="groupNames.length > 1">
32-
<sba-button-group class="mr-1">
33-
<sba-button
34-
:title="
35-
$t('applications.actions.switch_to_grouping_by_application')
36-
"
37-
:disabled="isGroupingFunctionActive('application')"
38-
@click="() => setGroupingFunction('application')"
39-
>
40-
<font-awesome-icon icon="list" />
41-
</sba-button>
42-
<sba-button
43-
:title="$t('applications.actions.switch_to_grouping_by_group')"
44-
:disabled="isGroupingFunctionActive('group')"
45-
@click="() => setGroupingFunction('group')"
46-
>
47-
<font-awesome-icon icon="expand" />
48-
</sba-button>
49-
</sba-button-group>
50-
</template>
51-
<ApplicationNotificationCenter
52-
v-if="hasNotificationFiltersSupport"
53-
:notification-filters="notificationFilters"
54-
@filter-remove="removeFilter"
55-
/>
56-
<div class="flex-1">
57-
<sba-input
58-
v-model="routerState.q"
59-
:placeholder="t('term.filter')"
60-
name="filter"
61-
type="search"
22+
<div class="container mx-auto flex justify-between">
23+
<div class="flex">
24+
<ApplicationStats />
25+
<sba-confirm-button
26+
class="mr-1"
27+
:title="$t('applications.actions.refresh_applications')"
28+
@click="refreshApplications"
6229
>
63-
<template #prepend>
64-
<font-awesome-icon icon="filter" />
65-
</template>
66-
</sba-input>
30+
<font-awesome-icon :icon="'rotate-left'" />
31+
</sba-confirm-button>
32+
<template v-if="groupNames.length > 1">
33+
<sba-button-group class="mr-1">
34+
<sba-button
35+
:title="
36+
$t('applications.actions.switch_to_grouping_by_application')
37+
"
38+
:disabled="isGroupingFunctionActive('application')"
39+
@click="() => setGroupingFunction('application')"
40+
>
41+
<font-awesome-icon icon="list" />
42+
</sba-button>
43+
<sba-button
44+
:title="
45+
$t('applications.actions.switch_to_grouping_by_group')
46+
"
47+
:disabled="isGroupingFunctionActive('group')"
48+
@click="() => setGroupingFunction('group')"
49+
>
50+
<font-awesome-icon icon="expand" />
51+
</sba-button>
52+
</sba-button-group>
53+
</template>
54+
<ApplicationNotificationCenter
55+
v-if="hasNotificationFiltersSupport"
56+
:notification-filters="notificationFilters"
57+
@filter-remove="removeFilter"
58+
/>
6759
</div>
60+
<sba-input
61+
v-model="routerState.q"
62+
:placeholder="t('term.filter')"
63+
name="filter"
64+
type="search"
65+
>
66+
<template #prepend>
67+
<font-awesome-icon icon="filter" />
68+
</template>
69+
</sba-input>
6870
</div>
6971
</sba-sticky-subnav>
7072

spring-boot-admin-server-ui/src/main/frontend/views/instances/auditevents/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<sba-instance-section :error="error" :loading="isLoading">
1919
<template #before>
2020
<sba-sticky-subnav>
21-
<div class="flex gap-2">
21+
<div class="flex gap-2 justify-end">
2222
<sba-input
2323
v-model.trim="filter.principal"
2424
:placeholder="$t('instances.auditevents.principal')"

spring-boot-admin-server-ui/src/main/frontend/views/instances/beans/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<sba-sticky-subnav>
2121
<sba-input
2222
v-model="filter"
23+
class="justify-self-end"
2324
:placeholder="$t('term.filter')"
2425
name="filter"
2526
type="search"

spring-boot-admin-server-ui/src/main/frontend/views/instances/conditions/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<sba-sticky-subnav>
2121
<sba-input
2222
v-model="filter"
23+
class="justify-self-end"
2324
:placeholder="$t('term.filter')"
2425
name="filter"
2526
type="search"

spring-boot-admin-server-ui/src/main/frontend/views/instances/configprops/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<sba-sticky-subnav>
2121
<sba-input
2222
v-model="filter"
23+
class="justify-self-end"
2324
:placeholder="$t('term.filter')"
2425
name="filter"
2526
type="search"

spring-boot-admin-server-ui/src/main/frontend/views/instances/dependencies/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<sba-sticky-subnav>
55
<sba-input
66
v-model="filter"
7+
class="justify-self-end"
78
:placeholder="$t('term.filter')"
89
name="filter"
910
type="search"

spring-boot-admin-server-ui/src/main/frontend/views/instances/env/index.vue

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,20 @@
1818
<sba-instance-section :error="error" :loading="isLoading">
1919
<template #before>
2020
<sba-sticky-subnav v-if="env">
21-
<div class="flex">
22-
<div v-if="instance.hasEndpoint('refresh')" class="mr-1">
23-
<refresh
24-
:application="application"
25-
:instance="instance"
26-
@refresh="fetchEnv"
27-
/>
28-
</div>
29-
<div v-if="instance.hasEndpoint('busrefresh')" class="mr-1">
30-
<busrefresh :instance="instance" @refresh="fetchEnv" />
21+
<div class="flex justify-between">
22+
<div>
23+
<div v-if="instance.hasEndpoint('refresh')" class="mr-1">
24+
<refresh
25+
:application="application"
26+
:instance="instance"
27+
@refresh="fetchEnv"
28+
/>
29+
</div>
30+
<div v-if="instance.hasEndpoint('busrefresh')" class="mr-1">
31+
<busrefresh :instance="instance" @refresh="fetchEnv" />
32+
</div>
3133
</div>
32-
<div class="flex-1">
34+
<div>
3335
<sba-input
3436
v-model="filter"
3537
:placeholder="$t('term.filter')"

spring-boot-admin-server-ui/src/main/frontend/views/instances/loggers/loggers.vue

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,28 @@
1818
<sba-instance-section :error="error" :loading="!hasLoaded">
1919
<template #before>
2020
<sba-sticky-subnav>
21-
<div class="flex gap-2">
21+
<div class="flex gap-2 justify-end">
2222
<sba-toggle-scope-button
2323
v-if="instanceCount > 1"
2424
v-model="scope"
2525
:instance-count="instanceCount"
2626
:show-info="false"
2727
/>
2828

29-
<div class="flex-1">
30-
<sba-input
31-
v-model="filter.name"
32-
:placeholder="$t('term.filter')"
33-
name="filter"
34-
type="search"
35-
>
36-
<template #prepend>
37-
<font-awesome-icon icon="filter" />
38-
</template>
39-
<template #append>
40-
<span v-text="filteredLoggers.length" /> /
41-
<span v-text="loggerConfig.loggers.length" />
42-
</template>
43-
</sba-input>
44-
</div>
29+
<sba-input
30+
v-model="filter.name"
31+
:placeholder="$t('term.filter')"
32+
name="filter"
33+
type="search"
34+
>
35+
<template #prepend>
36+
<font-awesome-icon icon="filter" />
37+
</template>
38+
<template #append>
39+
<span v-text="filteredLoggers.length" /> /
40+
<span v-text="loggerConfig.loggers.length" />
41+
</template>
42+
</sba-input>
4543

4644
<!-- FILTER -->
4745
<div>

spring-boot-admin-server-ui/src/main/frontend/views/instances/sbomdependencytrees/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<sba-sticky-subnav>
2121
<sba-input
2222
v-model="filter"
23+
class="justify-self-end"
2324
:placeholder="$t('term.filter')"
2425
name="filter"
2526
type="search"

spring-boot-admin-server-ui/src/main/frontend/views/instances/startup/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<sba-instance-section :error="error">
1919
<template #before>
2020
<sba-sticky-subnav>
21-
<div class="flex gap-2">
21+
<div class="flex gap-2 justify-between">
2222
<sba-button v-if="!isExpanded" @click="expandTree">
2323
<svg
2424
class="h-4 w-4"
@@ -45,7 +45,7 @@
4545
/>
4646
</svg>
4747
</sba-button>
48-
<div class="flex-1">
48+
<div>
4949
<sba-input
5050
v-model="filter"
5151
:placeholder="

0 commit comments

Comments
 (0)