Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

8 files changed, 40 insertions, 383 deletions

diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index f7b8a4c5b84..98074f8af29 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -105,6 +105,7 @@
     border: 0;
 
     &.table-row-header {
+      // stylelint-disable-next-line
       background-color: none;
       border: 0;
       font-weight: bold;
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index 87307fd682e..ee1385d36df 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -519,10 +519,6 @@ table.pipeline-project-metrics tr td {
       margin-left: 25px;
     }
 
-    .item-visibility {
-      margin-right: 0;
-    }
-
     .last-updated {
       position: relative;
       min-width: 250px;
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 019d827798c..2d04354a99d 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -106,17 +106,6 @@
         width: 100%;
       }
     }
-
-    .omniauth-btn {
-      width: 100%;
-      padding: $gl-padding-8;
-
-      img {
-        width: $default-icon-size;
-        height: $default-icon-size;
-        margin-right: $gl-padding;
-      }
-    }
   }
 
   .new-session-tabs {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
deleted file mode 100644
index 0ccde57746a..00000000000
--- a/app/assets/stylesheets/pages/members.scss
+++ /dev/null
@@ -1,253 +0,0 @@
-.project-members-title {
-  padding-bottom: 10px;
-  border-bottom: 1px solid $border-color;
-}
-
-.invite-users-form {
-  .btn-success {
-    margin-right: 10px;
-  }
-}
-
-.member {
-  &.is-overridden {
-    .btn-ldap-override {
-      display: none !important;
-    }
-  }
-
-  .controls {
-    @include media-breakpoint-up(sm) {
-      display: flex;
-    }
-
-    .dropdown-menu.dropdown-menu-right {
-      margin-top: -2px;
-    }
-  }
-
-  .form-group {
-    margin-bottom: 0;
-  }
-
-  &.existing-title {
-    @include media-breakpoint-up(sm) {
-      float: left;
-    }
-  }
-}
-
-.member-form-control {
-  @include media-breakpoint-down(xs) {
-    margin-right: 0;
-    width: auto;
-  }
-}
-
-.member-search-btn {
-  position: absolute;
-  right: 4px;
-  top: 0;
-  height: $input-height;
-  padding-left: 10px;
-  padding-right: 10px;
-  color: $gray-darkest;
-  background: transparent;
-  border: 0;
-  outline: 0;
-}
-
-.members-ldap {
-  align-self: center;
-}
-
-.alert-member-ldap {
-  background-color: $orange-50;
-
-  @include media-breakpoint-up(sm) {
-    line-height: 40px;
-  }
-
-  > p {
-    float: left;
-    margin-bottom: 10px;
-    color: $orange-600;
-
-    @include media-breakpoint-up(sm) {
-      padding-left: 55px;
-      margin-bottom: 0;
-    }
-  }
-
-  .controls {
-    width: 100%;
-
-    @include media-breakpoint-up(sm) {
-      width: auto;
-    }
-  }
-}
-
-.btn-ldap-override {
-  width: 100%;
-
-  @include media-breakpoint-up(sm) {
-    margin-left: 10px;
-    width: auto;
-  }
-}
-
-.flex-project-members-panel {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-
-  @include media-breakpoint-down(sm) {
-    display: block;
-
-    .flex-project-title {
-      vertical-align: top;
-      display: inline-block;
-      max-width: 90%;
-    }
-  }
-
-  .flex-project-title {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  .badge.badge-pill {
-    height: 17px;
-    line-height: 16px;
-    margin-right: 5px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-  }
-
-  .flex-users-form {
-    flex-wrap: nowrap;
-    white-space: nowrap;
-    margin-left: auto;
-  }
-}
-
-.card {
-  .card-header {
-    .badge.badge-pill {
-      margin-top: 0;
-    }
-
-    @include media-breakpoint-down(sm) {
-      .badge.badge-pill {
-        margin-right: 0;
-        margin-left: 0;
-      }
-    }
-  }
-}
-
-.content-list.members-list li {
-  .list-item-name {
-    float: none;
-    display: flex;
-    flex: 1;
-  }
-
-  .user-info {
-    padding-right: 10px;
-  }
-
-  .member {
-    font-weight: $gl-font-weight-bold;
-    overflow-wrap: break-word;
-    word-break: break-all;
-  }
-
-  .form-control {
-    width: inherit;
-  }
-
-  .btn {
-    align-self: flex-start;
-  }
-
-  @include media-breakpoint-down(sm) {
-    .member-access-text {
-      margin: 0 0 $gl-padding-4 ($grid-size * 6);
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    display: block;
-
-    .controls > .btn,
-    .controls .member-form-control {
-      margin: 0 0 $gl-padding-8;
-      display: block;
-    }
-
-    .form-control {
-      width: 100%;
-    }
-  }
-}
-
-
-.members-table {
-  @include media-breakpoint-up(lg) {
-    .col-meta {
-      width: px-to-rem(150px);
-    }
-
-    .col-max-role {
-      width: px-to-rem(175px);
-    }
-
-    .col-expiration {
-      width: px-to-rem(200px);
-    }
-
-    .col-actions {
-      width: px-to-rem(65px);
-    }
-  }
-
-  .gl-datepicker-input {
-    width: px-to-rem(165px);
-    max-width: 100%;
-  }
-}
-
-.card-mobile {
-  .content-list.members-list li {
-    display: block;
-
-    .member-controls {
-      float: none;
-      display: block;
-    }
-
-    .dropdown-menu-toggle,
-    .dropdown-menu,
-    .form-control,
-    .list-item-name {
-      width: 100%;
-    }
-
-    .dropdown-menu {
-      margin-top: 0;
-    }
-
-    .member-form-control {
-      margin: 5px 0;
-    }
-
-    .btn {
-      width: 100%;
-      margin-left: 0;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index a62df1258af..23e368a2e73 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -4,6 +4,7 @@
  */
 
 $mr-widget-min-height: 69px;
+$tabs-holder-z-index: 250;
 
 .space-children {
   @include clearfix;
@@ -225,10 +226,6 @@ $mr-widget-min-height: 69px;
     }
   }
 
-  .mini-pipeline-graph-dropdown-toggle {
-    vertical-align: top;
-  }
-
   .normal {
     flex: 1;
     flex-basis: auto;
@@ -675,7 +672,7 @@ $mr-widget-min-height: 69px;
 
 .mr-version-controls {
   position: relative;
-  z-index: 203;
+  z-index: $tabs-holder-z-index + 10;
   background: $white;
   color: $gl-text-color;
   margin-top: -1px;
@@ -745,7 +742,7 @@ $mr-widget-min-height: 69px;
 .merge-request-tabs-holder,
 .epic-tabs-holder {
   top: $header-height;
-  z-index: 250;
+  z-index: $tabs-holder-z-index;
   background-color: $body-bg;
   border-bottom: 1px solid $border-color;
 
@@ -981,15 +978,15 @@ $mr-widget-min-height: 69px;
     line-height: initial;
   }
 
-  .mini-pipeline-graph-dropdown-toggle,
-  .stage-cell .mini-pipeline-graph-dropdown-toggle svg,
-  // As the `mini-pipeline-item` mixin specificity is lower
-  // than the toggle of dropdown with 'variant="link"' we add
-  // classes ".gl-button.btn-link" to make it more specific.
-  // Once FF ci_mini_pipeline_gl_dropdown is removed, the `mini-pipeline-item`
-  // itself could increase its specificity to simplify this selector
-  button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle,
-  .stage-cell button.gl-button.btn-link.mini-pipeline-graph-gl-dropdown-toggle svg {
+  // GlDropdown mini pipeline (Vue)
+  //   As the `mini-pipeline-item` mixin specificity is lower
+  //   than the toggle of dropdown with 'variant="link"' we add
+  //   classes ".gl-button.btn-link" to make it more specific
+  //   and avoid having the size overriden
+  //
+  //   See https://gitlab.com/gitlab-org/gitlab/-/issues/320737
+  button.gl-button.btn-link.mini-pipeline-graph-dropdown-toggle,
+  .stage-cell button.gl-button.btn-link.mini-pipeline-graph-dropdown-toggle svg {
     height: $ci-action-icon-size-lg;
     width: $ci-action-icon-size-lg;
   }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index ffbfa47f9bd..cb5050fc578 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -302,8 +302,21 @@ table {
       width: 100%;
     }
   }
+}
+
+.discussion-reply-holder {
+  .reply-placeholder-text-field {
+    font-family: $monospace-font;
+    font-size: $gl-font-size-monospace;
+    border-radius: $gl-border-radius-base;
+    width: 100%;
+    resize: none;
+    padding: $gl-padding-8 $gl-padding-12;
+    line-height: 1;
+    border: 1px solid $border-color;
+    background-color: $white;
+    overflow: hidden;
 
-  .btn-text-field {
     @include media-breakpoint-down(xs) {
       margin-bottom: $gl-padding-8;
     }
@@ -381,32 +394,6 @@ table {
 }
 
 .comment-type-dropdown {
-  .btn-success {
-    width: auto;
-  }
-
-  .dropdown-toggle {
-    float: right;
-
-    i {
-      color: $white;
-      padding-right: 2px;
-      margin-top: 2px;
-    }
-
-    &[disabled] {
-      i {
-        color: $gl-text-color-disabled;
-      }
-    }
-  }
-
-  .dropdown-menu {
-    top: initial;
-    bottom: 100%;
-    width: 298px;
-  }
-
   @include media-breakpoint-down(xs) {
     display: flex;
     width: 100%;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 8251cdb9bbb..e51cc0b4479 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -136,33 +136,9 @@
 
 .project-repo-buttons {
   .btn {
-    &:last-child {
-      margin-left: 0;
-    }
-
     svg {
-      fill: $layout-link-gray;
+      fill: $gray-500;
     }
-
-    .notifications-icon {
-      top: 1px;
-      margin-right: 0;
-    }
-  }
-
-  .icon {
-    top: 0;
-  }
-
-  .count-badge,
-  .btn-xs {
-    height: 24px;
-  }
-
-  .home-panel-action-button,
-  .project-action-button {
-    margin: $gl-padding $gl-padding-8 0 0;
-    vertical-align: top;
   }
 
   .notification-dropdown .dropdown-menu {
@@ -175,34 +151,6 @@
     }
   }
 
-  .count-buttons {
-    display: inline-block;
-    vertical-align: top;
-    margin-top: $gl-padding;
-
-    .count-badge-count,
-    .count-badge-button {
-      border: 1px solid $border-color;
-      line-height: 1;
-    }
-
-    .count,
-    .count-badge-button {
-      color: $gl-text-color;
-    }
-
-    .count-badge-count {
-      padding: 0 12px;
-      background: $gray-light;
-      border-radius: 0 $border-radius-base $border-radius-base 0;
-    }
-
-    .count-badge-button {
-      border-right: 0;
-      border-radius: $border-radius-base 0 0 $border-radius-base;
-    }
-  }
-
   .project-clone-holder {
     display: inline-block;
     margin: $gl-padding 0 0;
@@ -313,7 +261,6 @@
 }
 
 .fork-thumbnail {
-  height: 200px;
   width: calc((100% / 2) - #{$gl-padding * 2});
 
   @include media-breakpoint-up(md) {
@@ -887,10 +834,6 @@ pre.light-well {
 }
 
 .git-clone-holder {
-  .btn-clipboard {
-    border: 1px solid $border-color;
-  }
-
   .clone-options {
     display: table-cell;
 
@@ -1008,6 +951,18 @@ pre.light-well {
   }
 }
 
+.compare-revision-cards {
+  @media (min-width: $breakpoint-lg) {
+    .gl-card {
+      width: calc(50% - 15px);
+    }
+
+    .compare-ellipsis {
+      width: 30px;
+    }
+  }
+}
+
 .clearable-input {
   position: relative;
 
diff --git a/app/assets/stylesheets/pages/trials.scss b/app/assets/stylesheets/pages/trials.scss
deleted file mode 100644
index 55f323b7df7..00000000000
--- a/app/assets/stylesheets/pages/trials.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* A CSS cross-browser fix for  Select2 failire to display HTML5 required warnings
-* MR link https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22716
-*/
-.gl-select2-html5-required-fix div.select2-container+select.select2 {
-  @include gl-opacity-0;
-  @include gl-border-0;
-  @include gl-bg-none;
-  @include gl-bg-transparent;
-  display: block !important;
-  width: 1px;
-  height: 1px;
-  z-index: -1;
-  margin: -3px auto 0;
-}