-
+
{{#copy-inline clipboardText=model.container.displayImage}}
{{model.container.displayImage}}
{{/copy-inline}}
-
+
{{#if model.container.displayIp}}
{{#copy-inline clipboardText=model.container.displayIp}}
{{model.container.displayIp}}
@@ -38,19 +38,19 @@
{{#if model.container.stack}}
-
+
{{#link-to "stack" projects.current.id model.container.stack.id}}{{model.container.stack.displayName}}{{/link-to}}
{{/if}}
{{#if model.container.primaryHost}}
-
+
{{#link-to "host" model.container.primaryHost.id}}{{model.container.primaryHost.displayName}}{{/link-to}}
{{/if}}
{{#if model.container.displayExternalId}}
-
+
{{#copy-inline clipboardText=model.container.externalId}}
{{model.container.displayExternalId}}
{{/copy-inline}}
diff --git a/app/host/template.hbs b/app/host/template.hbs
index 5f7a069ac..63ecd1a5d 100644
--- a/app/host/template.hbs
+++ b/app/host/template.hbs
@@ -32,13 +32,13 @@
-
+
{{#copy-inline clipboardText=host.displayIp}}
{{host.displayIp}}
{{/copy-inline}}
-
+
{{#if host.dockerEngineVersion}}
{{host.dockerEngineVersion}}
{{else}}
@@ -46,7 +46,7 @@
{{/if}}
-
+
{{#if host.driver}}
{{host.driver}}
{{else}}
@@ -70,7 +70,7 @@
}}
-
+
{{#if host.osDetail}}
{{host.osDetail}}
@@ -80,7 +80,7 @@
-
+
{{host.info.osInfo.kernelVersion}}
@@ -88,10 +88,10 @@
-
+
{{t 'generic.hardware'}}:
-
-
+
+
{{host.cpuBlurb}}
@@ -101,8 +101,8 @@
{{/if}}
-
-
+
+
{{#if host.memoryBlurb}}
{{host.memoryBlurb}}
@@ -111,8 +111,8 @@
{{/if}}
-
-
+
+
{{#if host.diskBlurb}}
{{#if host.diskDetail}}
@@ -129,22 +129,22 @@
-
+
{{t 'generic.limits'}}:
-
-
+
+
{{host.milliCpu}} {{t 'hostsPage.hostPage.infoMultiStats.milliCpu.labelText'}}
-
-
+
+
{{host.memoryLimitBlurb}}
-
-
+
+
{{host.localStorageBlurb}}
diff --git a/app/styles/abstracts/_mixins.scss b/app/styles/abstracts/_mixins.scss
index 6b16a227d..d5a61ab22 100755
--- a/app/styles/abstracts/_mixins.scss
+++ b/app/styles/abstracts/_mixins.scss
@@ -6,11 +6,11 @@
///Sets base color and darkens bg on hover
@mixin bg-color($bg) {
background: $bg;
- &.btn:hover, a:hover {
+ &.btn:hover{
background:darken($bg,10%);
transition: all 0.3s ease;
}
- &.btn:active, a:focus {
+ &.btn:active {
background:darken($bg,25%);
}
}
diff --git a/app/styles/components/_accordion.scss b/app/styles/components/_accordion.scss
index 775e49c5a..ea1ab8519 100644
--- a/app/styles/components/_accordion.scss
+++ b/app/styles/components/_accordion.scss
@@ -63,10 +63,6 @@ $accordion-header-border: $bg-default;
.physical-attrs {
.accordion-content {
- label,
- h2 {
- @extend .text-muted;
- }
> .row > .col.span-6 > .col.span-12 {
padding: 10px;
border-bottom: 1px solid $accent-border;
diff --git a/app/styles/components/_stack-app.scss b/app/styles/components/_stack-app.scss
index fe155129a..1efbffb32 100644
--- a/app/styles/components/_stack-app.scss
+++ b/app/styles/components/_stack-app.scss
@@ -1,6 +1,5 @@
.stack-app {
margin-bottom: 20px;
- border: 2px solid $table-border-color;
position: relative;
float: left;
width: calc(50% - 15px);
@@ -15,17 +14,19 @@
}
.catalog-icon {
@include catalog-img(transparent);
- border-right: 1px solid $border;
+ border: 1px solid $accent-border;
display: table-cell;
vertical-align: middle;
- width: 105px;
+ width: 120px;
+ padding: 0 10px;
}
.stack-info-row {
display: table-cell;
+ margin: 0 10px;
+ padding: 0 20px;
.stack-info-top,
.stack-info-bottom {
height: calc(105px/2);
- padding: 10px;
}
.stack-info-bottom {
.multi-bar {
@@ -36,7 +37,6 @@
}
.stack-info-top {
padding-top: 20px;
- border-bottom: 1px solid $border;
}
}
}
diff --git a/app/styles/pages/_host.scss b/app/styles/pages/_host.scss
index bff1a2a44..f11e8954c 100644
--- a/app/styles/pages/_host.scss
+++ b/app/styles/pages/_host.scss
@@ -200,6 +200,7 @@ ol > li {
padding: 10px 20px;
list-style: none;
background: $accent-bg;
+ border: solid $accent-border 1px;
}
ol > li::before {
content: counter(li);
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index e85a8297f..ad2a9684c 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -792,9 +792,9 @@ hostsPage:
provider:
labelText: 'Provider:'
noHost: Custom
- kernel: 'Kernel:'
+ kernel: 'Kernel'
docker: 'Docker:'
- os: 'OS:'
+ os: 'OS'
description: 'Description:'
milliCpu:
labelText: mCPU