Commit 198febc1 authored by Hector Bustillos's avatar Hector Bustillos Committed by Annabel Dunstone Gray

UI fixes for project templates and user groups

parent e236140b
...@@ -128,15 +128,15 @@ const bindEvents = () => { ...@@ -128,15 +128,15 @@ const bindEvents = () => {
}, },
iosswift: { iosswift: {
text: s__('ProjectTemplates|iOS (Swift)'), text: s__('ProjectTemplates|iOS (Swift)'),
icon: '.template-option svg.icon-gitlab', icon: '.template-option .icon-iosswift',
}, },
dotnetcore: { dotnetcore: {
text: s__('ProjectTemplates|.NET Core'), text: s__('ProjectTemplates|.NET Core'),
icon: '.template-option .icon-dotnet', icon: '.template-option .icon-dotnetcore',
}, },
android: { android: {
text: s__('ProjectTemplates|Android'), text: s__('ProjectTemplates|Android'),
icon: '.template-option svg.icon-android', icon: '.template-option .icon-android',
}, },
gomicro: { gomicro: {
text: s__('ProjectTemplates|Go Micro'), text: s__('ProjectTemplates|Go Micro'),
...@@ -164,27 +164,27 @@ const bindEvents = () => { ...@@ -164,27 +164,27 @@ const bindEvents = () => {
}, },
nfhugo: { nfhugo: {
text: s__('ProjectTemplates|Netlify/Hugo'), text: s__('ProjectTemplates|Netlify/Hugo'),
icon: '.template-option .icon-netlify', icon: '.template-option .icon-nfhugo',
}, },
nfjekyll: { nfjekyll: {
text: s__('ProjectTemplates|Netlify/Jekyll'), text: s__('ProjectTemplates|Netlify/Jekyll'),
icon: '.template-option .icon-netlify', icon: '.template-option .icon-nfjekyll',
}, },
nfplainhtml: { nfplainhtml: {
text: s__('ProjectTemplates|Netlify/Plain HTML'), text: s__('ProjectTemplates|Netlify/Plain HTML'),
icon: '.template-option .icon-netlify', icon: '.template-option .icon-nfplainhtml',
}, },
nfgitbook: { nfgitbook: {
text: s__('ProjectTemplates|Netlify/GitBook'), text: s__('ProjectTemplates|Netlify/GitBook'),
icon: '.template-option .icon-netlify', icon: '.template-option .icon-nfgitbook',
}, },
nfhexo: { nfhexo: {
text: s__('ProjectTemplates|Netlify/Hexo'), text: s__('ProjectTemplates|Netlify/Hexo'),
icon: '.template-option .icon-netlify', icon: '.template-option .icon-nfhexo',
}, },
salesforcedx: { salesforcedx: {
text: s__('ProjectTemplates|SalesforceDX'), text: s__('ProjectTemplates|SalesforceDX'),
icon: '.template-option svg.icon-gitlab', icon: '.template-option .icon-salesforcedx',
}, },
serverless_framework: { serverless_framework: {
text: s__('ProjectTemplates|Serverless Framework/JS'), text: s__('ProjectTemplates|Serverless Framework/JS'),
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
.description p { .description p {
margin-bottom: 0; margin-bottom: 0;
color: $gl-text-color-secondary;
} }
} }
......
- group = local_assigns.fetch(:group) - group = local_assigns.fetch(:group)
- css_class = 'no-description' if group.description.blank? - css_class = 'no-description' if group.description.blank?
%li.group-row{ class: css_class } %li.group-row.py-3{ class: css_class }
.controls .controls
= link_to _('Edit'), admin_group_edit_path(group), id: "edit_#{dom_id(group)}", class: 'btn' = 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' = 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'
......
- user = local_assigns.fetch(:user, current_user) - user = local_assigns.fetch(:user, current_user)
- access = user&.max_member_access_for_group(group.id) - 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 .stats
%span %span
= icon('bookmark') = icon('bookmark')
......
- link_project = local_assigns.fetch(:link_project, false) - link_project = local_assigns.fetch(:link_project, false)
- notes_count = @noteable_meta_data[snippet.id].user_notes_count - 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: '' = image_tag avatar_icon_for_user(snippet.author), class: "avatar s40 d-none d-sm-block", alt: ''
.title .title
......
...@@ -154,7 +154,6 @@ ...@@ -154,7 +154,6 @@
.template-option { .template-option {
display: none; display: none;
background: $gray-light;
.avatar-container { .avatar-container {
margin-left: 34px; margin-left: 34px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment