diff --git a/ui/app/styles/charts/colors.scss b/ui/app/styles/charts/colors.scss index 4f3c6335f..e204c723f 100644 --- a/ui/app/styles/charts/colors.scss +++ b/ui/app/styles/charts/colors.scss @@ -10,7 +10,8 @@ $lost: $dark; fill: $queued; } - .starting, .pending { + .starting, + .pending { .layer-0 { fill: $starting; } @@ -58,7 +59,8 @@ $lost: $dark; background: $queued; } - &.starting, &.pending { + &.starting, + &.pending { background: repeating-linear-gradient( -45deg, $starting, diff --git a/ui/app/styles/charts/distribution-bar.scss b/ui/app/styles/charts/distribution-bar.scss index a59c041fb..fcd4a7824 100644 --- a/ui/app/styles/charts/distribution-bar.scss +++ b/ui/app/styles/charts/distribution-bar.scss @@ -21,8 +21,7 @@ opacity: 0; } - $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple, - $red; + $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple, $red; @for $i from 1 through length($color-sequence) { .slice-#{$i - 1} { diff --git a/ui/app/styles/charts/tooltip.scss b/ui/app/styles/charts/tooltip.scss index c8e17f908..580e0ab3b 100644 --- a/ui/app/styles/charts/tooltip.scss +++ b/ui/app/styles/charts/tooltip.scss @@ -18,7 +18,7 @@ &::before { pointer-events: none; display: inline-block; - content: ""; + content: ''; width: 0; height: 0; border-top: 7px solid $grey; @@ -34,7 +34,7 @@ &::after { pointer-events: none; display: inline-block; - content: ""; + content: ''; width: 0; height: 0; border-top: 6px solid $white; diff --git a/ui/app/styles/components/json-viewer.scss b/ui/app/styles/components/json-viewer.scss index dd215bc97..4c6b1431f 100644 --- a/ui/app/styles/components/json-viewer.scss +++ b/ui/app/styles/components/json-viewer.scss @@ -13,7 +13,9 @@ $url-color: blue ) { font-family: monospace; - &, a, a:hover { + &, + a, + a:hover { color: $default-color; text-decoration: none; } @@ -31,10 +33,10 @@ display: none; } &.json-formatter-object:after { - content: "No properties"; + content: 'No properties'; } &.json-formatter-array:after { - content: "[]"; + content: '[]'; } } } @@ -100,7 +102,7 @@ // Inline preview on hover (optional) > a > .json-formatter-preview-text { opacity: 0; - transition: opacity .15s ease-in; + transition: opacity 0.15s ease-in; font-style: italic; } diff --git a/ui/app/styles/components/timeline.scss b/ui/app/styles/components/timeline.scss index bc3ab077a..553257c6c 100644 --- a/ui/app/styles/components/timeline.scss +++ b/ui/app/styles/components/timeline.scss @@ -4,7 +4,7 @@ z-index: $z-base; &::before { - content: " "; + content: ' '; position: absolute; display: block; top: 0; @@ -32,7 +32,7 @@ } &::before { - content: " "; + content: ' '; position: absolute; display: block; width: 10px; diff --git a/ui/app/styles/components/tooltip.scss b/ui/app/styles/components/tooltip.scss index bcb851033..68842c133 100644 --- a/ui/app/styles/components/tooltip.scss +++ b/ui/app/styles/components/tooltip.scss @@ -31,7 +31,7 @@ pointer-events: none; display: block; opacity: 0; - content: ""; + content: ''; width: 0; height: 0; border-top: 6px solid $black; diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss index 741dd892e..19ad29950 100644 --- a/ui/app/styles/core/forms.scss +++ b/ui/app/styles/core/forms.scss @@ -4,7 +4,12 @@ border-color: $grey-blue; color: $text; - &:hover, &.is-hovered, &:active, &.is-active, &:focus, &.is-focused { + &:hover, + &.is-hovered, + &:active, + &.is-active, + &:focus, + &.is-focused { border-color: darken($grey-blue, 5%); } @@ -14,7 +19,8 @@ } } -.input, .textarea { +.input, +.textarea { @include input; box-shadow: none; padding: 0.75em 1.5em; diff --git a/ui/app/styles/core/navbar.scss b/ui/app/styles/core/navbar.scss index 9d5929e15..39232665d 100644 --- a/ui/app/styles/core/navbar.scss +++ b/ui/app/styles/core/navbar.scss @@ -1,10 +1,6 @@ .navbar { &.is-primary { - background: linear-gradient( - to right, - $nomad-green-darker, - $nomad-green-dark - ); + background: linear-gradient(to right, $nomad-green-darker, $nomad-green-dark); height: 3.5rem; color: $primary-invert; padding-left: 20px; @@ -32,7 +28,7 @@ width: 1px; height: 1em; background: rgba($primary-invert, 0.5); - content: " "; + content: ' '; display: block; position: absolute; left: 0px; diff --git a/ui/app/styles/core/table.scss b/ui/app/styles/core/table.scss index e1c14d6ee..ecfacdd86 100644 --- a/ui/app/styles/core/table.scss +++ b/ui/app/styles/core/table.scss @@ -147,7 +147,7 @@ position: relative; &::after { - content: ""; + content: ''; width: 10px; right: 1.5em; top: 0.75em; @@ -157,11 +157,11 @@ } &.asc::after { - content: "⬇"; + content: '⬇'; } &.desc::after { - content: "⬆"; + content: '⬆'; } } @@ -186,7 +186,7 @@ &::after { position: absolute; - content: ""; + content: ''; width: 3px; top: 0; bottom: 0; diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss index 641706168..bef639661 100644 --- a/ui/app/styles/core/variables.scss +++ b/ui/app/styles/core/variables.scss @@ -22,8 +22,8 @@ $size-7: 0.85rem; $title-weight: $weight-semibold; -$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, - Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; +$family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, + Cantarell, 'Helvetica Neue', sans-serif; $text: $black; diff --git a/ui/app/styles/utils/product-colors.scss b/ui/app/styles/utils/product-colors.scss index 689b9e84e..bbf4b63aa 100644 --- a/ui/app/styles/utils/product-colors.scss +++ b/ui/app/styles/utils/product-colors.scss @@ -1,15 +1,15 @@ -$consul-pink: #FF0087; -$consul-pink-dark: #C62A71; +$consul-pink: #ff0087; +$consul-pink-dark: #c62a71; -$packer-blue: #1DAEFF; -$packer-blue-dark: #1D94DD; +$packer-blue: #1daeff; +$packer-blue-dark: #1d94dd; -$terraform-purple: #5C4EE5; -$terraform-purple-dark: #4040B2; +$terraform-purple: #5c4ee5; +$terraform-purple-dark: #4040b2; -$vagrant-blue: #1563FF; -$vagrant-blue-dark: #104EB2; +$vagrant-blue: #1563ff; +$vagrant-blue-dark: #104eb2; -$nomad-green: #25BA81; +$nomad-green: #25ba81; $nomad-green-dark: #1d9467; -$nomad-green-darker: #16704D; +$nomad-green-darker: #16704d; diff --git a/ui/config/targets.js b/ui/config/targets.js index 2bebfacad..547445947 100644 --- a/ui/config/targets.js +++ b/ui/config/targets.js @@ -1,10 +1,5 @@ /* eslint-env node */ module.exports = { - browsers: [ - 'ie 9', - 'last 1 Chrome versions', - 'last 1 Firefox versions', - 'last 1 Safari versions' - ] + browsers: ['ie 9', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'], }; diff --git a/ui/mirage/factories/client-stats.js b/ui/mirage/factories/client-stats.js index 8b8b4e13f..6924f07f6 100644 --- a/ui/mirage/factories/client-stats.js +++ b/ui/mirage/factories/client-stats.js @@ -12,27 +12,31 @@ export default Factory.extend({ }), CPU: () => [ - Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32)).fill(0).map((cpu, index) => ({ - CPU: `cpu${index}`, - Idle: 20, - System: 40, - Total: 80, - User: 40, - })), + Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32)) + .fill(0) + .map((cpu, index) => ({ + CPU: `cpu${index}`, + Idle: 20, + System: 40, + Total: 80, + User: 40, + })), ], CPUTicksConsumed: 1000000, diskStats: () => [ - Array(faker.random.number({ min: 1, max: 5 })).fill(0).map((disk, index) => ({ - Available: 100000000000, - Device: `/dev/disk${index}`, - InodesUsedPercent: 0.10000000001, - Mountpoint: '/', - Size: 2000000000000, - Used: 1000000000000, - UsedPercent: 50.0, - })), + Array(faker.random.number({ min: 1, max: 5 })) + .fill(0) + .map((disk, index) => ({ + Available: 100000000000, + Device: `/dev/disk${index}`, + InodesUsedPercent: 0.10000000001, + Mountpoint: '/', + Size: 2000000000000, + Used: 1000000000000, + UsedPercent: 50.0, + })), ], memory: () => ({ diff --git a/ui/mirage/serializers/application.js b/ui/mirage/serializers/application.js index 5bee3867e..6957d8991 100644 --- a/ui/mirage/serializers/application.js +++ b/ui/mirage/serializers/application.js @@ -1,6 +1,12 @@ import { RestSerializer } from 'ember-cli-mirage'; -const keyCase = str => (str === 'id' ? 'ID' : str.camelize().capitalize().replace(/Id/g, 'ID')); +const keyCase = str => + str === 'id' + ? 'ID' + : str + .camelize() + .capitalize() + .replace(/Id/g, 'ID'); export default RestSerializer.extend({ serialize() {