Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 9 deletions

diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index 305956e1baf..f6edf86e96e 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -8,6 +8,32 @@
   }
 }
 
+.groups-list {
+  @include basic-list;
+  display: flex;
+  flex-direction: column;
+  margin: 0;
+
+  .group-row-contents .controls > .btn:last-child {
+    margin: 0;
+  }
+
+  li {
+    .title {
+      font-weight: 600;
+    }
+
+    a {
+      color: $gray-900;
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+
 .group-root-path {
   max-width: 40vw;
   overflow: hidden;
@@ -15,11 +41,6 @@
   word-wrap: nowrap;
 }
 
-.content-list .group-name {
-  font-weight: $gl-font-weight-bold;
-  color: $pages-group-name-color;
-}
-
 .group-row {
   @include basic-list-stats;
 
@@ -322,10 +343,6 @@ table.pipeline-project-metrics tr td {
     }
   }
 
-  .content-list li:last-child {
-    padding-bottom: 0;
-  }
-
   .group-list-tree {
     margin-bottom: 0;
     margin-left: 30px;