Skip to content
Snippets Groups Projects
Commit f87124da authored by Taurie Davis's avatar Taurie Davis
Browse files

fix font weight of project feature settings

parent 60eca5f7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/assets/stylesheets/pages/projects.scss
+ 14
− 2
View file @ f87124da
@@ -13,9 +13,18 @@
@@ -13,9 +13,18 @@
   
.new_project, .new_project,
.edit-project { .edit-project {
fieldset { fieldset {
&.features .control-label {
font-weight: normal; &.features {
.label-light {
margin-bottom: 0;
}
.help-block {
margin-top: 0;
}
} }
   
.form-group { .form-group {
@@ -40,6 +49,7 @@
@@ -40,6 +49,7 @@
} }
   
.input-group > div { .input-group > div {
&:last-child { &:last-child {
padding-right: 0; padding-right: 0;
} }
@@ -47,6 +57,7 @@
@@ -47,6 +57,7 @@
   
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.input-group > div { .input-group > div {
margin-bottom: 14px; margin-bottom: 14px;
   
&:last-child { &:last-child {
@@ -60,6 +71,7 @@
@@ -60,6 +71,7 @@
} }
   
.input-group-addon { .input-group-addon {
&.static-namespace { &.static-namespace {
height: 35px; height: 35px;
border-radius: 3px; border-radius: 3px;
app/views/projects/edit.html.haml
+ 58
− 58
View file @ f87124da
@@ -46,70 +46,70 @@
@@ -46,70 +46,70 @@
%h5.prepend-top-0 %h5.prepend-top-0
Feature Visibility Feature Visibility
   
= f.fields_for :project_feature do |feature_fields| = f.fields_for :project_feature do |feature_fields|
.form_group.prepend-top-20 .form_group.prepend-top-20
.row .row
.col-md-9 .col-md-9
= feature_fields.label :repository_access_level, "Repository", class: 'label-light' = feature_fields.label :repository_access_level, "Repository", class: 'label-light'
%span.help-block Push files to be stored in this project %span.help-block Push files to be stored in this project
.col-md-3.js-repo-access-level .col-md-3.js-repo-access-level
= project_feature_access_select(:repository_access_level) = project_feature_access_select(:repository_access_level)
   
.col-sm-12 .col-sm-12
.row .row
.col-md-9.project-feature-nested .col-md-9.project-feature-nested
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light' = feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
%span.help-block Submit changes to be merged upstream %span.help-block Submit changes to be merged upstream
.col-md-3 .col-md-3
= project_feature_access_select(:merge_requests_access_level) = project_feature_access_select(:merge_requests_access_level)
   
.row .row
.col-md-9.project-feature-nested .col-md-9.project-feature-nested
= feature_fields.label :builds_access_level, "Builds", class: 'label-light' = feature_fields.label :builds_access_level, "Builds", class: 'label-light'
%span.help-block Submit, test and deploy your changes before merge %span.help-block Submit, test and deploy your changes before merge
.col-md-3 .col-md-3
= project_feature_access_select(:builds_access_level) = project_feature_access_select(:builds_access_level)
   
.row .row
.col-md-9 .col-md-9
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light' = feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
%span.help-block Share code pastes with others out of Git repository %span.help-block Share code pastes with others out of Git repository
.col-md-3 .col-md-3
= project_feature_access_select(:snippets_access_level) = project_feature_access_select(:snippets_access_level)
   
.row .row
.col-md-9 .col-md-9
= feature_fields.label :issues_access_level, "Issues", class: 'label-light' = feature_fields.label :issues_access_level, "Issues", class: 'label-light'
%span.help-block Lightweight issue tracking system for this project %span.help-block Lightweight issue tracking system for this project
.col-md-3 .col-md-3
= project_feature_access_select(:issues_access_level) = project_feature_access_select(:issues_access_level)
   
.row .row
.col-md-9 .col-md-9
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light' = feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
%span.help-block Pages for project documentation %span.help-block Pages for project documentation
.col-md-3 .col-md-3
= project_feature_access_select(:wiki_access_level) = 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')
   
- if Gitlab.config.lfs.enabled && current_user.admin? - if Gitlab.config.lfs.enabled && current_user.admin?
.form-group .checkbox
.checkbox = f.label :lfs_enabled do
= f.label :container_registry_enabled do = f.check_box :lfs_enabled
= f.check_box :container_registry_enabled %strong LFS
%strong Container Registry %br
%br %span.descr
%span.descr Enable Container Registry for this project Git Large File Storage
= link_to icon('question-circle'), help_page_path('user/project/container_registry'), target: '_blank' = 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 = render 'merge_request_settings', f: f
%hr %hr
@@ -288,4 +288,4 @@
@@ -288,4 +288,4 @@
Saving project. Saving project.
%p Please wait a moment, this page will automatically refresh when ready. %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
\ No newline at end of file
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