diff options
| author | Enrique Alcantara <ealcantara@gitlab.com> | 2019-03-25 16:23:50 -0400 |
|---|---|---|
| committer | Enrique Alcantara <ealcantara@gitlab.com> | 2019-03-25 16:55:05 -0400 |
| commit | 6b394a801fb4cb8f598a5f124eb91517a2b705fc (patch) | |
| tree | 10c74013b9898ce7b0a83779bdac0bcf99820227 | |
| parent | 9ea2c959d9d27b8370e6c1d6c5d77615f318c6d3 (diff) | |
| download | gitlab-ce-6b394a801fb4cb8f598a5f124eb91517a2b705fc.tar.gz | |
Fix regressions post bootstrap_form upgrade
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 9 | ||||
| -rw-r--r-- | app/views/profiles/show.html.haml | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 8e933b62dd9..4f52112d779 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -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; diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 1fffea08dae..02c750a92c3 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -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 |