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

Fix regressions post bootstrap_form upgrade

Browse source
This commit is contained in:
Enrique Alcantara 2019-03-25 16:23:50 -04:00
parent 9ea2c959d9
commit 6b394a801f
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/pages/profile.scss
View file

@ -438,8 +438,17 @@ table.u2f-registrations {
}
}
.form-group > label {
font-weight: $gl-font-weight-bold;
}
.form-group > .form-text {
font-size: $gl-font-size;
}
.emoji-menu-toggle-button {
@include emoji-menu-toggle-button;
padding: 6px 10px;
.no-emoji-placeholder {
position: relative;

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

@ -99,10 +99,10 @@
.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
= f.check_box :private_profile, label: private_profile_label, inline: true, wrapper_class: 'mr-0'
= link_to icon('question-circle'), help_page_path('user/profile/index.md', anchor: 'private-profile')
%h5= s_("Profiles|Private contributions")
= f.check_box :include_private_contributions, label: 'Include private contributions on my profile'
= f.check_box :include_private_contributions, label: 'Include private contributions on my profile', wrapper_class: 'mb-2', inline: true
.help-block
= s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information")
.prepend-top-default.append-bottom-default