Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

3 files changed, 95 insertions, 4 deletions

diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss
index 67213eedca8..3c8abe43070 100644
--- a/app/assets/stylesheets/components/avatar.scss
+++ b/app/assets/stylesheets/components/avatar.scss
@@ -68,7 +68,7 @@ $avatar-sizes: (
 );
 
 $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal,
-  $identicon-orange, $gray-darker;
+  $identicon-orange, $identicon-gray;
 
 %avatar-circle {
   float: left;
@@ -125,8 +125,8 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
 .identicon {
   text-align: center;
   vertical-align: top;
-  color: $gray-700;
-  background-color: $gray-darker;
+  color: $identicon-text-color;
+  background-color: $identicon-gray;
 
   // Sizes
   @each $size, $size-config in $avatar-sizes {
diff --git a/app/assets/stylesheets/components/deployment_instance.scss b/app/assets/stylesheets/components/deployment_instance.scss
new file mode 100644
index 00000000000..a8c3400deca
--- /dev/null
+++ b/app/assets/stylesheets/components/deployment_instance.scss
@@ -0,0 +1,91 @@
+.deployment-instance {
+  width: $gl-padding;
+  height: $gl-padding;
+  margin: 1px;
+  border: 1px solid;
+  border-radius: $border-radius-small;
+  position: relative;
+
+  &-succeeded {
+    background-color: $green-600;
+    border-color: $green-800;
+
+    &.link:hover {
+      background-color: $green-800;
+      border-color: $green-950;
+    }
+  }
+
+  &-running {
+    background-color: $green-300;
+    border-color: $green-600;
+
+    &.link:hover {
+      background-color: $green-500;
+      border-color: $green-800;
+    }
+  }
+
+  &-failed {
+    background-color: $red-600;
+    border-color: $red-800;
+
+    &::before {
+      content: '';
+      border: 1px solid $white;
+      background: $white;
+      transform: rotate(45deg);
+      position: absolute;
+      border-radius: 1px;
+      top: -2px;
+      bottom: -2px;
+    }
+
+    &.link:hover {
+      background-color: $red-800;
+      border-color: $red-950;
+    }
+  }
+
+  &-pending {
+    background-color: $gray-200;
+    border-color: $gray-500;
+
+    &.link:hover {
+      background-color: $gray-300;
+      border-color: $gray-900;
+    }
+  }
+
+  &-unknown {
+    background-color: $white;
+    border-color: $gray-500;
+
+    &.link:hover {
+      background-color: $white;
+      border-color: $gray-900;
+    }
+  }
+
+  &.deployment-instance-canary {
+    &::after {
+      width: 7px;
+      height: 7px;
+      border: 1px solid $white;
+      background-color: $orange-300;
+      border-radius: 50%;
+      content: '';
+      z-index: 1;
+    }
+  }
+
+  &-canary-icon {
+    background-color: transparent;
+    border: 0;
+
+    &::after {
+      width: $gl-padding !important;
+      height: $gl-padding !important;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/components/whats_new.scss b/app/assets/stylesheets/components/whats_new.scss
index 51bf2686be2..3e9060e869b 100644
--- a/app/assets/stylesheets/components/whats_new.scss
+++ b/app/assets/stylesheets/components/whats_new.scss
@@ -57,7 +57,7 @@
 }
 
 .whats-new-modal-backdrop {
-  z-index: 9;
+  z-index: 699;
 }
 
 .whats-new-notification-count {