Skip to content

S
spring-boot-admin
Commit 30805d05 by Johannes Edmeier
Options

fix overflow issue in jolokia view

fixes #728
parent f3283f30
Showing with 48 additions and 52 deletions
spring-boot-admin-server-ui/package-lock.json
......@@ -191,61 +191,40 @@
}
},
"@fortawesome/fontawesome": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.5.tgz",
"integrity": "sha512-WAgbcVs7/YTxq7RK/dhyoJPzaIZpOQnStyO5s1sj0rZa0J1ScXYoGPmsP1ec6qM/BhDjRVB228xr2DiCPTHRCA==",
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.7.tgz",
"integrity": "sha512-N2xkrhWyPkjs7fu3fH8UhuhEcIcS23ArrPIAJOiqttNy1Xip3/ZSolXtreIbMmex/W3NpCEL1hPmeVZJ0d9sLg==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.1.3"
"@fortawesome/fontawesome-common-types": "^0.1.6"
}
},
"@fortawesome/fontawesome-common-types": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.3.tgz",
"integrity": "sha512-jJXUoNkmHozqlcXzNiYytcmEe3eNxn7Vh8hmnIoRi0TmT3ChQ0osuSApuIObIomnIcvqlA24FCpnamKvfZ7F5g=="
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.6.tgz",
"integrity": "sha512-p4oEK5k1Uy2va1jLv2eVRLv6LJwXw/EkZTm8ZFX9YAga2vuzhHuIsaL1FAtkqzZJ/ZpEygTle5eGTe3Hc9jvuA=="
},
"@fortawesome/fontawesome-free-brands": {
"version": "5.0.10",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.10.tgz",
"integrity": "sha512-x4u7M5u9oWHgvh80VrvYNMFVtyyIyul0kCCK0K47fIeLrILjMAkcjbzeubulvRml31+k1qzqrqxVo83K06CdTw==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.12.tgz",
"integrity": "sha512-xR31L9zO/WmLxliTGl/WHCgYJbCWan+krZrELKpAwWjcbMsR8ui15BeVrZ7vbhTZUhWgJdMMVfEvsQq2tnFHRQ==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.1.4"
},
"dependencies": {
"@fortawesome/fontawesome-common-types": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.4.tgz",
"integrity": "sha512-JEgIoqh9HAQWul8CVLrOmWUI8nUQfCJZygRJ1Cr2H/O3+pCpVszW199cIpc7k7Nr1HJtLD77AUZVnxaKllx7AQ=="
}
"@fortawesome/fontawesome-common-types": "^0.1.6"
}
},
"@fortawesome/fontawesome-free-regular": {
"version": "5.0.10",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.10.tgz",
"integrity": "sha512-w9MMoabrhW/hBT4NpcBX0a7WQc/EQWkBkm8IklWZgBLoJER8lpEwMqBAa+eqnNJXqCKOnganFSFg2P+Fsi+T9A==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.12.tgz",
"integrity": "sha512-1t9DTBHl61V0vFXZo0/FOXkmUox2r5IR3d6guviim5psgVyWShy0yqAIvbqGE+O6WiO/UEUEKdGzgXvIr2eX3g==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.1.4"
},
"dependencies": {
"@fortawesome/fontawesome-common-types": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.4.tgz",
"integrity": "sha512-JEgIoqh9HAQWul8CVLrOmWUI8nUQfCJZygRJ1Cr2H/O3+pCpVszW199cIpc7k7Nr1HJtLD77AUZVnxaKllx7AQ=="
}
"@fortawesome/fontawesome-common-types": "^0.1.6"
}
},
"@fortawesome/fontawesome-free-solid": {
"version": "5.0.10",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.10.tgz",
"integrity": "sha512-RFxCG49xJcU7NwcEjAnJaerlzCzCX5sx9HdbHt3E1zML2skwmAZ2PwqyEfuT0iW2ZfYyx6SU1Zf0GUa7FL6f/A==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.12.tgz",
"integrity": "sha512-37Uasdz6v2N/9reg5K5ufARPsrdMWJiYJzmFBgsB/F5cb7aLASeijzLvY+iP2FFir7KpEVGBOkGktWyIPTfR7w==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.1.4"
},
"dependencies": {
"@fortawesome/fontawesome-common-types": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.4.tgz",
"integrity": "sha512-JEgIoqh9HAQWul8CVLrOmWUI8nUQfCJZygRJ1Cr2H/O3+pCpVszW199cIpc7k7Nr1HJtLD77AUZVnxaKllx7AQ=="
}
"@fortawesome/fontawesome-common-types": "^0.1.6"
}
},
"@fortawesome/vue-fontawesome": {
......
spring-boot-admin-server-ui/package.json
......@@ -9,10 +9,10 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@fortawesome/fontawesome": "^1.1.5",
"@fortawesome/fontawesome-free-brands": "^5.0.10",
"@fortawesome/fontawesome-free-regular": "^5.0.10",
"@fortawesome/fontawesome-free-solid": "^5.0.10",
"@fortawesome/fontawesome": "^1.1.7",
"@fortawesome/fontawesome-free-brands": "^5.0.12",
"@fortawesome/fontawesome-free-regular": "^5.0.12",
"@fortawesome/fontawesome-free-solid": "^5.0.12",
"@fortawesome/vue-fontawesome": "0.0.22",
"axios": "^0.18.0",
"bulma": "^0.7.1",
......
spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/index.vue
......@@ -39,7 +39,7 @@
</ul>
</nav>
</div>
<div class="column" v-if="selectedDomain">
<div class="column is-clipped" v-if="selectedDomain">
<h1 class="heading">MBeans</h1>
<div class="m-bean card" :class="{'is-active': mBean === selectedMBean}"
v-for="mBean in selectedDomain.mBeans" :key="mBean.descriptor.raw" :id="mBean.descriptor.raw"
......@@ -48,12 +48,12 @@
<header class="m-bean--header hero"
:class="{'is-primary': mBean === selectedMBean, 'is-selectable' : mBean !== selectedMBean }"
@click="select(selectedDomain, mBean)">
<div class="level">
<div class="level is-clipped">
<div class="level-left">
<div class="level-item"
<div class="level-item is-narrow"
v-for="attribute in mBean.descriptor.attributes"
:key="`mBean-desc-${attribute.name}`">
<div>
<div class="is-clipped" :title="`${attribute.name} ${attribute.value}`">
<p class="heading" v-text="attribute.name"/>
<p class="title is-size-6" v-text="attribute.value"/>
</div>
......@@ -241,10 +241,27 @@
background-color: $white-bis;
}
.m-bean--header--close {
position: absolute;
right: 0.75rem;
top: 0.75rem;
&--header {
& .level .level-left {
width: 100%;
& .level-item {
min-width: 0;
flex-shrink: 1;
& p {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
&--close {
position: absolute;
right: 0.75rem;
top: 0.75rem;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment