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

1 files changed, 13 insertions, 58 deletions

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;