diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-29 19:45:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-29 19:45:08 +0000 |
| commit | 1b447b1642b4a1b91e595d319d7d90f2b43515ef (patch) | |
| tree | 13b8dff45bc43ee8367f9a0a150c86e6dfa4b8e0 | |
| parent | cdda83ebe9c5e85074d1bd2d718ab84afc672e17 (diff) | |
| parent | 05b97af34314e0d1db7c989f20e18c0fca5a7daa (diff) | |
| download | gitlab-ce-1b447b1642b4a1b91e595d319d7d90f2b43515ef.tar.gz | |
Merge branch 'fix/profile-settings-sidebar-heading' into 'master'
Keep typographic hierarchy in User Settings
See merge request gitlab-org/gitlab-ce!16090
| -rw-r--r-- | app/views/profiles/audit_log.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-profile-settings-sidebar-heading.yml | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml index 1a392e29e2a..cbea5ca605a 100644 --- a/app/views/profiles/audit_log.html.haml +++ b/app/views/profiles/audit_log.html.haml @@ -4,7 +4,7 @@ .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h3.prepend-top-0 + %h4.prepend-top-0 = page_title %p This is a security log of important events involving your account. diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index e98fdfc7a3d..202eccb7bb6 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -10,16 +10,16 @@ %li= msg = hidden_field_tag :notification_type, 'global' - .row + .row.prepend-top-default .col-lg-4.profile-settings-sidebar - %h4 + %h4.prepend-top-0 = page_title %p You can specify notification level per group or per project. %p By default, all projects and groups will use the global notifications setting. .col-lg-8 - %h5 + %h5.prepend-top-0 Global notification settings = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| diff --git a/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml b/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml new file mode 100644 index 00000000000..75e0ea5612f --- /dev/null +++ b/changelogs/unreleased/fix-profile-settings-sidebar-heading.yml @@ -0,0 +1,5 @@ +--- +title: Keep typographic hierarchy in User Settings +merge_request: 16090 +author: George Tsiolis +type: fixed |