diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-05 06:48:16 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-05 12:49:10 +0300 |
| commit | 14d3f1d93caab64c7b64ab0a32088f66a64558ee (patch) | |
| tree | 4c5f0bf197ab73b53032dd0fcf2f8249e5f37acc | |
| parent | d783f79bbb5a10ecb8de03a883ed8ca23bd6c0c5 (diff) | |
Merge branch '47147-project-visibility-alignment' into 'master'
Resolve "New project visibility level description alignment"
Closes #47147 and #46885
See merge request gitlab-org/gitlab-ce!19389
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/_visibility_level.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 2b3773eebad..43c39c43bc1 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -174,7 +174,7 @@ .option-description, .option-disabled-reason { - margin-left: 45px; + margin-left: 30px; color: $project-option-descr-color; } diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml index 38c6f560dc6..01ce1225b8d 100644 --- a/app/views/shared/_visibility_level.html.haml +++ b/app/views/shared/_visibility_level.html.haml @@ -5,7 +5,7 @@ = f.label :visibility_level, class: 'col-form-label col-sm-2' do Visibility Level = link_to icon('question-circle'), help_page_path("public_access/public_access") - %div{ :class => ("col-sm-10" if with_label) } + %div{ :class => (with_label ? "col-sm-10" : "col-sm-12") } - if can_change_visibility_level = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model) - else |