Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

3 files changed, 12 insertions, 33 deletions

diff --git a/app/assets/stylesheets/page_bundles/boards.scss b/app/assets/stylesheets/page_bundles/boards.scss
index 428bd90ddd7..10183f774b1 100644
--- a/app/assets/stylesheets/page_bundles/boards.scss
+++ b/app/assets/stylesheets/page_bundles/boards.scss
@@ -153,16 +153,16 @@
 // pseudo-element that is the same size as our element, then
 // animate opacity/transform to give a soothing single pulse
 .board-column-highlighted::after {
+  @include gl-focus;
   content: '';
   position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  top: -1px;
+  bottom: -1px;
+  left: -1px;
+  right: -1px;
   pointer-events: none;
   opacity: 0;
-  z-index: -1;
-  box-shadow: 0 0 6px 3px $blue-200;
+  border-radius: $border-radius-default;
   animation-name: board-column-flash-border;
   animation-duration: 1.2s;
   animation-fill-mode: forwards;
@@ -173,18 +173,11 @@
   0%,
   100% {
     opacity: 0;
-    transform: scale(0.98);
   }
 
   25%,
   75% {
     opacity: 1;
-    transform: scale(0.99);
-  }
-
-  50% {
-    opacity: 1;
-    transform: scale(1);
   }
 }
 
@@ -476,6 +469,10 @@
   .gl-drawer-header {
     align-items: flex-start;
   }
+
+  .labels-select-wrapper.is-embedded .labels-select-wrapper.is-embedded {
+    width: auto;
+  }
 }
 
 .board-header-collapsed-info-icon:hover {
diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index 525481638f3..c74b5460e1a 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -22,16 +22,11 @@
 
 .import-entities-target-select {
   &.disabled {
-    .import-entities-target-select-separator,
-    .select2-container.select2-container-disabled .select2-choice {
+    .import-entities-target-select-separator {
       color: var(--gray-400, $gray-400);
       border-color: var(--gray-100, $gray-100);
       background-color: var(--gray-10, $gray-10);
     }
-
-    .select2-container.select2-container-disabled .select2-choice .select2-arrow {
-      background-color: var(--gray-10, $gray-10);
-    }
   }
 
   .import-entities-target-select-separator {
@@ -39,20 +34,6 @@
     background-color: var(--gray-10, $gray-10);
   }
 
-  .select2-container {
-    > .select2-choice {
-      .select2-arrow {
-        background-color: var(--white, $white);
-      }
-
-      border-color: var(--gray-200, $gray-200);
-      color: var(--gray-900, $gray-900) !important;
-      background-color: var(--white, $white) !important;
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-  }
-
   .gl-form-input {
     box-shadow: inset 0 0 0 1px var(--gray-200, $gray-200);
   }
diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss
index 5525ad66e42..1e6567189be 100644
--- a/app/assets/stylesheets/page_bundles/wiki.scss
+++ b/app/assets/stylesheets/page_bundles/wiki.scss
@@ -1,5 +1,6 @@
 @import 'mixins_and_variables_and_functions';
 @import 'highlight.js/scss/a11y-light';
+@import 'components/content_editor';
 
 .title .edit-wiki-header {
   width: 780px;