Skip to content

S
spring-boot-admin
Commit 495b631a by Johannes Edmeier
Options

Harmonize header margins

parent bb765862
Showing with 101 additions and 97 deletions
spring-boot-admin-server-ui/core/css/core.css
...@@ -40,7 +40,7 @@ pre { ...@@ -40,7 +40,7 @@ pre {
/* ---------- */ /* ---------- */
.header--navbar { .header--navbar {
margin: 0; margin: 0 0 20px 0;
} }
.header--navbar .navbar-inner { .header--navbar .navbar-inner {
font-family: Montserrat, sans-serif; font-family: Montserrat, sans-serif;
......
spring-boot-admin-server-ui/modules/applications-details/views/details.html
<div class="container" ui-view> <div class="container" ui-view>
<div class="alert alert-error" ng-if="error"> <div class="alert alert-error" ng-if="error">
<b>Error:</b> {{ error }} <b>Error:</b> {{ error }}
</div> </div>
<div class="row"> <form class="form-inline">
<form class="form-inline"> <button title="refresh" class="btn" ng-click="refresh()"><i class="fa fa-repeat"></i></button>
<button title="refresh" class="btn" ng-click="refresh()"><i class="fa fa-repeat"></i></button> <div class="input-prepend input-append">
<div class="input-prepend input-append"> <button title="auto refresh" class="btn" ng-click="toggleAutoRefresh()" ng-class="{'active':refresher != null}">
<button title="auto refresh" class="btn" ng-click="toggleAutoRefresh()" ng-class="{'active':refresher != null}">
<i class="fa fa-refresh" ng-class="{'fa-spin':refresher != null}"></i> <i class="fa fa-refresh" ng-class="{'fa-spin':refresher != null}"></i>
</button> </button>
<input class="input-mini" type="number" min="1" ng-model="refreshInterval" ng-disabled="refresher != null" /> <input class="input-mini" type="number" min="1" ng-model="refreshInterval" ng-disabled="refresher != null" />
<span class="add-on">sec</span> <span class="add-on">sec</span>
</div> </div>
</form> </form>
</div> <div style="display: flex; flex-wrap: wrap; justify-content: space-around;">
<div style="display: flex; flex-wrap: wrap; justify-content: space-around;"> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Application" raw="api/applications/{{ application.id }}/info">
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Application" raw="api/applications/{{ application.id }}/info"> <table class="table">
<table class="table"> <tr ng-repeat="(key, value) in info">
<tr ng-repeat="(key, value) in info"> <td ng-bind="key"></td>
<td ng-bind="key"></td> <td style="white-space: pre" ng-bind-html="value | yaml | linkify:50"></td>
<td style="white-space: pre" ng-bind-html="value | yaml | linkify:50"></td> </tr>
</tr> </table>
</table> </sba-info-panel>
</sba-info-panel> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Health" raw="api/applications/{{ application.id }}/health">
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Health" raw="api/applications/{{ application.id }}/health"> <sba-health-status health="health"></sba-health-status>
<sba-health-status health="health"></sba-health-status> </sba-info-panel>
</sba-info-panel> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Memory" raw="api/applications/{{ application.id }}/metrics/mem.*%7Cheap.*">
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Memory" raw="api/applications/{{ application.id }}/metrics/mem.*%7Cheap.*"> <sba-memory-stats metrics=metrics></sba-memory-stats>
<sba-memory-stats metrics=metrics></sba-memory-stats> </sba-info-panel>
</sba-info-panel> <sba-info-panel class="span6" style="margin-left:0px" panel-title="JVM" raw="api/applications/{{ application.id }}/metrics/systemload.*%7Cclasses.*%7Cuptime%7Cprocessors%7Cthreads.*">
<sba-info-panel class="span6" style="margin-left:0px"panel-title="JVM" raw="api/applications/{{ application.id }}/metrics/systemload.*%7Cclasses.*%7Cuptime%7Cprocessors%7Cthreads.*"> <sba-jvm-stats metrics="metrics"></sba-jvm-stats>
<sba-jvm-stats metrics="metrics"></sba-jvm-stats> </sba-info-panel>
</sba-info-panel> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Garbage Collection" raw="api/applications/{{ application.id }}/metrics/gc.*">
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Garbage Collection" raw="api/applications/{{ application.id }}/metrics/gc.*"> <sba-gc-stats metrics="metrics"></sba-gc-stats>
<sba-gc-stats metrics="metrics"></sba-gc-stats> </sba-info-panel>
</sba-info-panel> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Servlet Container" raw="api/applications/{{ application.id }}/metrics/httpsessions.*"
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Servlet Container" raw="api/applications/{{ application.id }}/metrics/httpsessions.*" ng-show="metrics['httpsessions.active'] != null"> ng-show="metrics['httpsessions.active'] != null">
<sba-servlet-container-stats metrics="metrics"></sba-servlet-container-stats> <sba-servlet-container-stats metrics="metrics"></sba-servlet-container-stats>
</sba-info-panel> </sba-info-panel>
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Datasources" raw="api/applications/{{ application.id }}/metrics/datasource.*" ng-show="hasDatasources"> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Datasources" raw="api/applications/{{ application.id }}/metrics/datasource.*"
<sba-datasource-stats metrics="metrics"></sba-datasource-stats> ng-show="hasDatasources">
</sba-info-panel> <sba-datasource-stats metrics="metrics"></sba-datasource-stats>
<sba-info-panel class="span6" style="margin-left:0px" panel-title="Caches" raw="api/applications/{{ application.id }}/metrics/cache.*" ng-show="hasCaches"> </sba-info-panel>
<sba-cache-stats metrics="metrics"></sba-cache-stats> <sba-info-panel class="span6" style="margin-left:0px" panel-title="Caches" raw="api/applications/{{ application.id }}/metrics/cache.*"
</sba-info-panel> ng-show="hasCaches">
</div> <sba-cache-stats metrics="metrics"></sba-cache-stats>
</div> </sba-info-panel>
</div>
</div>
\ No newline at end of file
spring-boot-admin-server-ui/modules/applications-environment/views/environment.html
<div class="container"> <div class="container">
<div class="alert alert-error" ng-if="error"> <div class="alert alert-error" ng-if="error">
<b>Error:</b> {{ error }} <b>Error:</b> {{ error }}
</div> </div>
<sba-info-panel panel-title="Active profiles" raw="api/applications/{{ application.id }}/env"> <sba-info-panel panel-title="Active profiles" raw="api/applications/{{ application.id }}/env">
<table class="table"> <table class="table">
<tr> <tr>
<td>{{profiles.join(', ') || '-'}}</td> <td>{{profiles.join(', ') || '-'}}</td>
</tr> </tr>
</table> </table>
</sba-info-panel> </sba-info-panel>
<sba-info-panel panel-title="Environment manager" ng-show="refreshSupported"> <sba-info-panel panel-title="Environment manager" ng-show="refreshSupported">
<sba-environment-manager environment="env" application="application" on-environment-changed="refresh"></sba-environment-manager> <sba-environment-manager environment="env" application="application" on-environment-changed="refresh"></sba-environment-manager>
</sba-info-panel> </sba-info-panel>
<div class="input-append"> <form class="form-inline input-append">
<input placeholder="Filter" class="input-xxlarge" type="search" ng-model="searchFilter" /> <input placeholder="Filter" class="input-xxlarge" type="search" ng-model="searchFilter" />
<button class="btn" title="reload list" ng-click="refresh()"><i class="fa fa-repeat"></i></button> <button class="btn" title="reload list" ng-click="refresh()"><i class="fa fa-repeat"></i></button>
</div> </form>
<sba-info-panel category="PropertySource" panel-title="{{source.name}}" ng-repeat="source in env" ng-show="!searchFilter || (source.value | filter:searchFilter).length > 0"> <sba-info-panel category="PropertySource" panel-title="{{source.name}}" ng-repeat="source in env" ng-show="!searchFilter || (source.value | filter:searchFilter).length > 0">
<table class="table"> <table class="table">
<col width="38%"> <col width="38%">
<col width="62%"> <col width="62%">
<tr ng-repeat="property in source.value | filter:searchFilter"> <tr ng-repeat="property in source.value | filter:searchFilter">
<td style="word-break: break-all;">{{property.name}}</td> <td style="word-break: break-all;">{{property.name}}</td>
<td style="word-break: break-all;">{{property.value}}</td> <td style="word-break: break-all;">{{property.value}}</td>
</tr> </tr>
<tr ng-if="source.value.length == 0"> <tr ng-if="source.value.length == 0">
<td colspan="2">-</td> <td colspan="2">-</td>
</tr> </tr>
</table> </table>
</sba-info-panel> </sba-info-panel>
</div> </div>
\ No newline at end of file
spring-boot-admin-server-ui/modules/applications-trace/views/trace.html
<div class="container"> <div class="container">
<div class="alert alert-error" ng-if="error"> <div class="alert alert-error" ng-if="error">
<b>Error:</b> {{ error }} <b>Error:</b> {{ error }}
</div> </div>
<div class="form-inline"> <form class="form-inline">
<button title="refresh" class="btn" ng-click="refresh()"><i class="fa fa-repeat"></i></button> <button title="refresh" class="btn" ng-click="refresh()"><i class="fa fa-repeat"></i></button>
<div class="input-prepend input-append"> <div class="input-prepend input-append">
<button title="auto refresh" class="btn" ng-click="toggleAutoRefresh()" ng-class="{'active':refresher != null}"> <button title="auto refresh" class="btn" ng-click="toggleAutoRefresh()" ng-class="{'active':refresher != null}">
<i class="fa fa-refresh" ng-class="{'fa-spin':refresher != null}"></i> <i class="fa fa-refresh" ng-class="{'fa-spin':refresher != null}"></i>
</button> </button>
<input class="input-mini" type="number" min="1" ng-model="refreshInterval" ng-disabled="refresher != null" /> <input class="input-mini" type="number" min="1" ng-model="refreshInterval" ng-disabled="refresher != null" />
<span class="add-on">sec</span> <span class="add-on">sec</span>
</div> </div>
<input placeholder="Filter" class="input-xxlarge" type="search" ng-model="searchFilter" /> <input placeholder="Filter" class="input-xxlarge" type="search" ng-model="searchFilter" />
</div> </form>
<ul class="timeline"> <ul class="timeline">
<li ng-repeat="trace in traces | filter:searchFilter"> <li ng-repeat="trace in traces | filter:searchFilter">
<sba-trace value="trace"></sba-trace> <sba-trace value="trace"></sba-trace>
</li> </li>
</ul> </ul>
</div> </div>
\ No newline at end of file
spring-boot-admin-server-ui/modules/applications/css/module.css
.header--application { .header--application {
margin-bottom: 20px; margin: -20px 0 20px 0;
font-size: 15px; font-size: 15px;
} }
.header--application .navbar-inner { .header--application .navbar-inner {
......
spring-boot-admin-server-ui/package.json
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"test": "karma start karma.conf.js", "test": "karma start karma.conf.js",
"watch:js": "webpack -d --watch", "watch:js": "webpack -d --watch",
"watch:test": "karma start karma.conf.js --watch", "watch:test": "karma start karma.conf.js --watch",
"dev-server": "webpack-dev-server --port 9000 --host 0.0.0.0" "dev-server": "webpack-dev-server --port 9090 --host 0.0.0.0"
}, },
"dependencies": { "dependencies": {
"angular": "1.5.8", "angular": "1.5.8",
......
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