Commit 8caaf936 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch...

Merge branch '239850-convert-stylesheets-pages-members-scss-into-page-specific-bundle' into 'master'

Convert `members.scss` into page specific bundle

See merge request gitlab-org/gitlab!56278
parents fc2886f1 e827c58a
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
@import './pages/issues'; @import './pages/issues';
@import './pages/labels'; @import './pages/labels';
@import './pages/login'; @import './pages/login';
@import './pages/members';
@import './pages/merge_requests'; @import './pages/merge_requests';
@import './pages/monitor'; @import './pages/monitor';
@import './pages/note_form'; @import './pages/note_form';
......
@import 'mixins_and_variables_and_functions';
.project-members-title { .project-members-title {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
......
- add_page_specific_style 'page_bundles/members'
- add_to_breadcrumbs _("Groups"), admin_groups_path - add_to_breadcrumbs _("Groups"), admin_groups_path
- breadcrumb_title @group.name - breadcrumb_title @group.name
- page_title @group.name, _("Groups") - page_title @group.name, _("Groups")
......
- add_page_specific_style 'page_bundles/members'
- add_to_breadcrumbs _("Projects"), admin_projects_path - add_to_breadcrumbs _("Projects"), admin_projects_path
- breadcrumb_title @project.full_name - breadcrumb_title @project.full_name
- page_title @project.full_name, _("Projects") - page_title @project.full_name, _("Projects")
......
- add_page_specific_style 'page_bundles/members'
- page_title _('Group members') - page_title _('Group members')
- can_manage_members = can?(current_user, :admin_group_member, @group) - can_manage_members = can?(current_user, :admin_group_member, @group)
- show_invited_members = can_manage_members && @invited_members.exists? - show_invited_members = can_manage_members && @invited_members.exists?
......
- add_page_specific_style 'page_bundles/members'
- page_title _("Members") - page_title _("Members")
.js-remove-member-modal .js-remove-member-modal
......
...@@ -196,6 +196,7 @@ module Gitlab ...@@ -196,6 +196,7 @@ module Gitlab
config.assets.precompile << "page_bundles/jira_connect.css" config.assets.precompile << "page_bundles/jira_connect.css"
config.assets.precompile << "page_bundles/jira_connect_users.css" config.assets.precompile << "page_bundles/jira_connect_users.css"
config.assets.precompile << "page_bundles/learn_gitlab.css" config.assets.precompile << "page_bundles/learn_gitlab.css"
config.assets.precompile << "page_bundles/members.css"
config.assets.precompile << "page_bundles/merge_conflicts.css" config.assets.precompile << "page_bundles/merge_conflicts.css"
config.assets.precompile << "page_bundles/merge_requests.css" config.assets.precompile << "page_bundles/merge_requests.css"
config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/milestone.css"
......
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