diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-01 14:16:27 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-01 14:16:27 +0000 |
| commit | c9267aafc6864792333a9b106a5ef897d21fccdb (patch) | |
| tree | c9b1c55c784176bed5fea52145e23d9d4e8f1e63 | |
| parent | df73116f75d4a7545fb4a7684aa76624efede7d0 (diff) | |
| parent | 1a815e7091a7c1176af97693950357a9437e1ddd (diff) | |
| download | gitlab-ce-c9267aafc6864792333a9b106a5ef897d21fccdb.tar.gz | |
Merge branch '51476-private-profile-help-url-should-not-toggle-checkbox' into 'master'
Resolve "Private profile help url should not toggle checkbox"
Closes #51476
See merge request gitlab-org/gitlab-ce!21757
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 10 | ||||
| -rw-r--r-- | app/views/profiles/show.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 28dda65091d..3c9505a21d6 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -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; } diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 51f5ecf2166..ea215e3e718 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -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 diff --git a/changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml b/changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml new file mode 100644 index 00000000000..d4e4503508d --- /dev/null +++ b/changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml @@ -0,0 +1,5 @@ +--- +title: Prevents private profile help link from toggling checkbox +merge_request: 21757 +author: +type: other |