Merge branch '39465-39469-issues-solutions' into 'master'

UI improvements in the views for new project from template and the user groups and snippets

Closes #39469 and #39465

See merge request gitlab-org/gitlab!21524

app/assets/javascripts/projects/project_new.js

@@ -128,15 +128,15 @@ const bindEvents = () => {
       },
       iosswift: {
         text: s__('ProjectTemplates|iOS (Swift)'),
-        icon: '.template-option svg.icon-gitlab',
+        icon: '.template-option .icon-iosswift',
       },
       dotnetcore: {
         text: s__('ProjectTemplates|.NET Core'),
-        icon: '.template-option .icon-dotnet',
+        icon: '.template-option .icon-dotnetcore',
       },
       android: {
         text: s__('ProjectTemplates|Android'),
-        icon: '.template-option svg.icon-android',
+        icon: '.template-option .icon-android',
       },
       gomicro: {
         text: s__('ProjectTemplates|Go Micro'),
@@ -164,27 +164,27 @@ const bindEvents = () => {
       },
       nfhugo: {
         text: s__('ProjectTemplates|Netlify/Hugo'),
-        icon: '.template-option .icon-netlify',
+        icon: '.template-option .icon-nfhugo',
       },
       nfjekyll: {
         text: s__('ProjectTemplates|Netlify/Jekyll'),
-        icon: '.template-option .icon-netlify',
+        icon: '.template-option .icon-nfjekyll',
       },
       nfplainhtml: {
         text: s__('ProjectTemplates|Netlify/Plain HTML'),
-        icon: '.template-option .icon-netlify',
+        icon: '.template-option .icon-nfplainhtml',
       },
       nfgitbook: {
         text: s__('ProjectTemplates|Netlify/GitBook'),
-        icon: '.template-option .icon-netlify',
+        icon: '.template-option .icon-nfgitbook',
       },
       nfhexo: {
         text: s__('ProjectTemplates|Netlify/Hexo'),
-        icon: '.template-option .icon-netlify',
+        icon: '.template-option .icon-nfhexo',
       },
       salesforcedx: {
         text: s__('ProjectTemplates|SalesforceDX'),
-        icon: '.template-option svg.icon-gitlab',
+        icon: '.template-option .icon-salesforcedx',
       },
       serverless_framework: {
         text: s__('ProjectTemplates|Serverless Framework/JS'),

app/assets/stylesheets/pages/groups.scss

@@ -25,6 +25,7 @@
 
   .description p {
     margin-bottom: 0;
+    color: $gl-text-color-secondary;
   }
 }
 

app/views/admin/groups/_group.html.haml

 - group = local_assigns.fetch(:group)
 - css_class = 'no-description' if group.description.blank?
 
-%li.group-row{ class: css_class }
+%li.group-row.py-3{ class: css_class }
   .controls
     = link_to _('Edit'), admin_group_edit_path(group), id: "edit_#{dom_id(group)}", class: 'btn'
     = link_to _('Delete'), [:admin, group], data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name } }, method: :delete, class: 'btn btn-remove'

app/views/shared/groups/_group.html.haml

 - user = local_assigns.fetch(:user, current_user)
 - access = user&.max_member_access_for_group(group.id)
 
-%li.group-row{ class: ('no-description' if group.description.blank?) }
+%li.group-row.py-3{ class: ('no-description' if group.description.blank?) }
   .stats
     %span
       = icon('bookmark')

app/views/shared/snippets/_snippet.html.haml

 - link_project = local_assigns.fetch(:link_project, false)
 - notes_count = @noteable_meta_data[snippet.id].user_notes_count
 
-%li.snippet-row
+%li.snippet-row.py-3
   = image_tag avatar_icon_for_user(snippet.author), class: "avatar s40 d-none d-sm-block", alt: ''
 
   .title

ee/app/assets/stylesheets/pages/projects.scss

@@ -154,7 +154,6 @@
 
   .template-option {
     display: none;
-    background: $gray-light;
 
     .avatar-container {
       margin-left: 34px;