Merge branch '2.0.x' into 2.1.x

joshiste · joshiste · commit 34fb9387a895 · 2019-03-27T23:06:35.000+01:00
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/index.vue b/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/index.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2014-2018 the original author or authors.
+  - Copyright 2014-2019 the original author or authors.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -96,6 +96,7 @@
       flex-grow: 1;
       flex-shrink: 1;
       z-index: 10;
+      max-width: calc(100vw - 175px); /*sidebar-width*/
     }
   }
 </style>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`- - Copyright 2014-2018 the original author or authors.`
	`2`	`+ - Copyright 2014-2019 the original author or authors.`
`3`	`3`	`-`
`4`	`4`	`- Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`- you may not use this file except in compliance with the License.`
`@@ -96,6 +96,7 @@`
`96`	`96`	`flex-grow: 1;`
`97`	`97`	`flex-shrink: 1;`
`98`	`98`	`z-index: 10;`
	`99`	`+ max-width: calc(100vw - 175px); /sidebar-width/`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`	`</style>`