Merge branch 'project-settings--features-weight' into 'master'
fix font weight of project feature settings ## What does this MR do? Fixes font weight for project feature settings ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-14_at_9.49.06_AM](/uploads/76e1f91cd8f6fcf9197a51215b497e4a/Screen_Shot_2016-10-14_at_9.49.06_AM.png) After: ![Screen_Shot_2016-10-14_at_11.43.44_AM](/uploads/ecb378400d787c50dba2c3833bb72964/Screen_Shot_2016-10-14_at_11.43.44_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_16964612 See merge request !6902
This commit is contained in:
commit
baec0353df
2 changed files with 72 additions and 60 deletions
|
@ -13,9 +13,18 @@
|
|||
|
||||
.new_project,
|
||||
.edit-project {
|
||||
|
||||
fieldset {
|
||||
&.features .control-label {
|
||||
font-weight: normal;
|
||||
|
||||
&.features {
|
||||
|
||||
.label-light {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.help-block {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.form-group {
|
||||
|
@ -40,6 +49,7 @@
|
|||
}
|
||||
|
||||
.input-group > div {
|
||||
|
||||
&:last-child {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
@ -47,6 +57,7 @@
|
|||
|
||||
@media (max-width: $screen-xs-max) {
|
||||
.input-group > div {
|
||||
|
||||
margin-bottom: 14px;
|
||||
|
||||
&:last-child {
|
||||
|
@ -60,6 +71,7 @@
|
|||
}
|
||||
|
||||
.input-group-addon {
|
||||
|
||||
&.static-namespace {
|
||||
height: 35px;
|
||||
border-radius: 3px;
|
||||
|
|
|
@ -46,70 +46,70 @@
|
|||
%h5.prepend-top-0
|
||||
Feature Visibility
|
||||
|
||||
= f.fields_for :project_feature do |feature_fields|
|
||||
.form_group.prepend-top-20
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :repository_access_level, "Repository", class: 'label-light'
|
||||
%span.help-block Push files to be stored in this project
|
||||
.col-md-3.js-repo-access-level
|
||||
= project_feature_access_select(:repository_access_level)
|
||||
= f.fields_for :project_feature do |feature_fields|
|
||||
.form_group.prepend-top-20
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :repository_access_level, "Repository", class: 'label-light'
|
||||
%span.help-block Push files to be stored in this project
|
||||
.col-md-3.js-repo-access-level
|
||||
= project_feature_access_select(:repository_access_level)
|
||||
|
||||
.col-sm-12
|
||||
.row
|
||||
.col-md-9.project-feature-nested
|
||||
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
||||
%span.help-block Submit changes to be merged upstream
|
||||
.col-md-3
|
||||
= project_feature_access_select(:merge_requests_access_level)
|
||||
.col-sm-12
|
||||
.row
|
||||
.col-md-9.project-feature-nested
|
||||
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
||||
%span.help-block Submit changes to be merged upstream
|
||||
.col-md-3
|
||||
= project_feature_access_select(:merge_requests_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9.project-feature-nested
|
||||
= feature_fields.label :builds_access_level, "Builds", class: 'label-light'
|
||||
%span.help-block Submit, test and deploy your changes before merge
|
||||
.col-md-3
|
||||
= project_feature_access_select(:builds_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature-nested
|
||||
= feature_fields.label :builds_access_level, "Builds", class: 'label-light'
|
||||
%span.help-block Submit, test and deploy your changes before merge
|
||||
.col-md-3
|
||||
= project_feature_access_select(:builds_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
||||
%span.help-block Share code pastes with others out of Git repository
|
||||
.col-md-3
|
||||
= project_feature_access_select(:snippets_access_level)
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
||||
%span.help-block Share code pastes with others out of Git repository
|
||||
.col-md-3
|
||||
= project_feature_access_select(:snippets_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
||||
%span.help-block Lightweight issue tracking system for this project
|
||||
.col-md-3
|
||||
= project_feature_access_select(:issues_access_level)
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
||||
%span.help-block Lightweight issue tracking system for this project
|
||||
.col-md-3
|
||||
= project_feature_access_select(:issues_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
||||
%span.help-block Pages for project documentation
|
||||
.col-md-3
|
||||
= project_feature_access_select(:wiki_access_level)
|
||||
|
||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||
.checkbox
|
||||
= f.label :lfs_enabled do
|
||||
= f.check_box :lfs_enabled
|
||||
%strong LFS
|
||||
%br
|
||||
%span.descr
|
||||
Git Large File Storage
|
||||
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
||||
.row
|
||||
.col-md-9
|
||||
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
||||
%span.help-block Pages for project documentation
|
||||
.col-md-3
|
||||
= project_feature_access_select(:wiki_access_level)
|
||||
|
||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||
.form-group
|
||||
.checkbox
|
||||
= f.label :container_registry_enabled do
|
||||
= f.check_box :container_registry_enabled
|
||||
%strong Container Registry
|
||||
%br
|
||||
%span.descr Enable Container Registry for this project
|
||||
= link_to icon('question-circle'), help_page_path('user/project/container_registry'), target: '_blank'
|
||||
.checkbox
|
||||
= f.label :lfs_enabled do
|
||||
= f.check_box :lfs_enabled
|
||||
%strong LFS
|
||||
%br
|
||||
%span.descr
|
||||
Git Large File Storage
|
||||
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
||||
|
||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||
.form-group
|
||||
.checkbox
|
||||
= f.label :container_registry_enabled do
|
||||
= f.check_box :container_registry_enabled
|
||||
%strong Container Registry
|
||||
%br
|
||||
%span.descr Enable Container Registry for this project
|
||||
= link_to icon('question-circle'), help_page_path('user/project/container_registry'), target: '_blank'
|
||||
|
||||
= render 'merge_request_settings', f: f
|
||||
%hr
|
||||
|
@ -288,4 +288,4 @@
|
|||
Saving project.
|
||||
%p Please wait a moment, this page will automatically refresh when ready.
|
||||
|
||||
= render 'shared/confirm_modal', phrase: @project.path
|
||||
= render 'shared/confirm_modal', phrase: @project.path
|
Loading…
Reference in a new issue