Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 5 deletions

diff --git a/app/assets/javascripts/groups/components/group_folder.vue b/app/assets/javascripts/groups/components/group_folder.vue
index 042d818338a..96162c32d52 100644
--- a/app/assets/javascripts/groups/components/group_folder.vue
+++ b/app/assets/javascripts/groups/components/group_folder.vue
@@ -39,7 +39,7 @@ export default {
 </script>
 
 <template>
-  <ul class="groups-list group-list-tree">
+  <ul class="groups-list group-list-tree gl-display-flex gl-flex-direction-column gl-m-0">
     <group-item
       v-for="(group, index) in groups"
       :key="index"
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 4f21f68fa65..2241d57f96f 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -157,7 +157,9 @@ export default {
       </a>
       <div class="group-text-container d-flex flex-fill align-items-center">
         <div class="group-text flex-grow-1 flex-shrink-1">
-          <div class="d-flex align-items-center flex-wrap title namespace-title gl-mr-3">
+          <div
+            class="gl-display-flex gl-align-items-center gl-flex-wrap title namespace-title gl-font-weight-bold gl-mr-3"
+          >
             <a
               v-gl-tooltip.bottom
               data-testid="group-name"
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue
index 313c8dadd1f..5706df0dd1b 100644
--- a/app/assets/javascripts/groups/components/groups.vue
+++ b/app/assets/javascripts/groups/components/groups.vue
@@ -43,7 +43,12 @@ export default {
 
 <template>
   <div class="groups-list-tree-container qa-groups-list-tree-container">
-    <div v-if="searchEmpty" class="has-no-search-results">{{ searchEmptyMessage }}</div>
+    <div
+      v-if="searchEmpty"
+      class="has-no-search-results gl-font-style-italic gl-text-center gl-text-gray-600 gl-p-5"
+    >
+      {{ searchEmptyMessage }}
+    </div>
     <template v-else>
       <group-folder :groups="groups" :action="action" />
       <pagination-links
diff --git a/app/assets/javascripts/groups/components/item_caret.vue b/app/assets/javascripts/groups/components/item_caret.vue
index 94d39a9c572..ef82e6d693a 100644
--- a/app/assets/javascripts/groups/components/item_caret.vue
+++ b/app/assets/javascripts/groups/components/item_caret.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <template>
-  <span class="folder-caret gl-mr-2">
+  <span class="folder-caret gl-display-inline-block gl-text-secondary gl-w-5 gl-mr-2">
     <gl-icon :size="12" :name="iconClass" />
   </span>
 </template>
diff --git a/app/assets/javascripts/groups/components/item_type_icon.vue b/app/assets/javascripts/groups/components/item_type_icon.vue
index 7821e604700..da4173993c5 100644
--- a/app/assets/javascripts/groups/components/item_type_icon.vue
+++ b/app/assets/javascripts/groups/components/item_type_icon.vue
@@ -24,5 +24,7 @@ export default {
 </script>
 
 <template>
-  <span class="item-type-icon"> <gl-icon :name="iconClass" /> </span>
+  <span class="item-type-icon gl-display-inline-block gl-text-secondary">
+    <gl-icon :name="iconClass" />
+  </span>
 </template>