summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaurie Davis <taurie@gitlab.com>2018-06-05 03:48:16 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-05 03:48:16 +0000
commit6f7082b255b853c5e28e7074ed5dddeff94cf328 (patch)
tree4aafd735790aa9c58299ba79088b9e98cc0553bb
parente3ebcb68da1266f5b5ede1fd58fe3ffefeff7fa3 (diff)
downloadgitlab-ce-6f7082b255b853c5e28e7074ed5dddeff94cf328.tar.gz
Resolve "New project visibility level description alignment"
-rw-r--r--app/assets/stylesheets/pages/settings.scss2
-rw-r--r--app/views/shared/_visibility_level.html.haml4
2 files changed, 3 insertions, 3 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 d67409ffe14..01ce1225b8d 100644
--- a/app/views/shared/_visibility_level.html.haml
+++ b/app/views/shared/_visibility_level.html.haml
@@ -1,11 +1,11 @@
- with_label = local_assigns.fetch(:with_label, true)
-.form-group.visibility-level-setting
+.form-group.row.visibility-level-setting
- if with_label
= 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