From 153d844029d825b89816bff5b926b51f24cc9b51 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 16:10:01 +0100 Subject: Review changes --- app/assets/stylesheets/pages/projects.scss | 2 +- app/helpers/icons_helper.rb | 5 ++++- app/views/admin/groups/_form.html.haml | 6 +++--- app/views/groups/new.html.haml | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 5cbd14974a5..e654ead5f10 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -304,7 +304,7 @@ color: $project-option-descr-color; } - .fa-lock { + .private { color: $red-500; } } diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index ab3ef454e1c..f17528b8b78 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -37,9 +37,12 @@ module IconsHelper end def visibility_level_icon(level, fw: true) + options = {} + name = case level when Gitlab::VisibilityLevel::PRIVATE + options[:class] = 'private' 'lock' when Gitlab::VisibilityLevel::INTERNAL 'shield' @@ -49,7 +52,7 @@ module IconsHelper name << " fw" if fw - icon(name) + icon(name, options) end def file_type_icon_class(type, mode, name) diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index db4783f46d0..584e1a78fec 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -1,12 +1,12 @@ .row.prepend-top-default - .col-lg-3.profile-settings-sidebar + .col-xs-12.col-lg-3.profile-settings-sidebar %h4.prepend-top-0 New Group %p A group is a collection of several projects. Groups can be private, public or limited to any logged in users. You can move existing projects to a group. - .col-lg-9 + .col-xs-12.col-lg-9 = form_for [:admin, @group], html: { class: "form-horizontal" } do |f| = form_errors(@group) = render 'shared/group_form', f: f @@ -18,7 +18,7 @@ .form-group.col-xs-12.project-visibility-level-holder = f.label :visibility_level, class: 'label-light' do Visibility Level - = link_to icon('question-circle'), help_page_path("public_access/public_access") + = link_to icon('question-circle'), help_page_path("public_access/public_access"), 'aria-hidden' => 'true' = render('shared/visibility_radios', model_method: :visibility_level, form: f, can_change_visibility_level: can_change_group_visibility_level?(@group), selected_level: visibility_level, form_model: @group) .form-group.col-xs-12 diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index d51d88509af..41cba568687 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -2,14 +2,14 @@ - header_title "Groups", dashboard_groups_path .row.prepend-top-default - .col-lg-3.profile-settings-sidebar + .col-xs-12.col-lg-3.profile-settings-sidebar %h4.prepend-top-0 New Group %p A group is a collection of several projects. Groups can be private, public or limited to any logged in users. You can move existing projects to a group. - .col-lg-9 + .col-xs-12.col-lg-9 = form_for @group, html: { class: 'group-form form-horizontal gl-show-field-errors' } do |f| = form_errors(@group) = render 'shared/group_form', f: f, autofocus: true @@ -21,7 +21,7 @@ .form-group.col-xs-12.project-visibility-level-holder = f.label :visibility_level, class: 'label-light' do Visibility Level - = link_to icon('question-circle'), help_page_path("public_access/public_access") + = link_to icon('question-circle'), help_page_path("public_access/public_access"), 'aria-hidden' => 'true' = render('shared/visibility_radios', model_method: :visibility_level, form: f, can_change_visibility_level: true, selected_level: default_group_visibility, form_model: @group) = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled -- cgit v1.2.3