kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve "Private profile help url should not toggle checkbox"

Browse source
This commit is contained in:
Martin Wortschack 2018-10-01 14:16:27 +00:00 committed by Annabel Dunstone Gray
parent df73116f75
commit 1a815e7091
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/framework/common.scss
View file

@ -324,6 +324,16 @@ img.emoji {
word-wrap: break-word;
}
.checkbox-icon-inline-wrapper {
.checkbox {
display: inline;
label {
display: inline;
}
}
}
/** COMMON CLASSES **/
.prepend-top-0 { margin-top: 0; }
.prepend-top-2 { margin-top: 2px; }

7
app/views/profiles/show.html.haml
View file

@ -109,10 +109,11 @@
= f.text_area :bio, rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters.")
%hr
%h5= ("Private profile")
- private_profile_label = capture do
= s_("Profiles|Don't display activity-related personal information on your profiles")
.checkbox-icon-inline-wrapper
- private_profile_label = capture do
= s_("Profiles|Don't display activity-related personal information on your profiles")
= f.check_box :private_profile, label: private_profile_label
= link_to icon('question-circle'), help_page_path('user/profile/index.md', anchor: 'private-profile')
= f.check_box :private_profile, label: private_profile_label
%h5= s_("Profiles|Private contributions")
= f.check_box :include_private_contributions, label: 'Include private contributions on my profile'
.help-block

5
changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Prevents private profile help link from toggling checkbox
merge_request: 21757
author:
type: other