diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-18 08:41:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-18 08:41:12 +0000 |
| commit | f93190429743f66d2a085891d51d004b390b4491 (patch) | |
| tree | 1e2d0f3432425505d547ee09be30896a2e495dab /app | |
| parent | a0fcbda9e2d81c966e787c8c8e2ac256dcdb1233 (diff) | |
| parent | 2be995d71ca111b06b070bb0b724d76ea752ecb0 (diff) | |
| download | gitlab-ce-f93190429743f66d2a085891d51d004b390b4491.tar.gz | |
Merge branch 'rs-issue-1626' into 'master'
Fix labels for project/snippet visibility selection
Closes #1626
See merge request !671
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/_visibility_radios.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/_form.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 49e5aad1f67..16b9814a0fc 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -129,7 +129,7 @@ } .option-descr { - margin-left: 24px; + margin-left: 36px; color: $gray; } } diff --git a/app/views/shared/_visibility_radios.html.haml b/app/views/shared/_visibility_radios.html.haml index b07c4d20f12..02416125a72 100644 --- a/app/views/shared/_visibility_radios.html.haml +++ b/app/views/shared/_visibility_radios.html.haml @@ -1,7 +1,7 @@ - Gitlab::VisibilityLevel.values.each do |level| .radio - restricted = restricted_visibility_levels.include?(level) - = label model_method, level do + = form.label "#{model_method}_#{level}" do = form.radio_button model_method, level, checked: (selected_level == level), disabled: restricted = visibility_level_icon(level) .option-title diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 6783587bda9..9610f9ce414 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -11,7 +11,7 @@ .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: true, form_model: @snippet - + .form-group .file-editor = f.label :file_name, "File", class: 'control-label' |