Commit 1b447b16 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/profile-settings-sidebar-heading' into 'master'

Keep typographic hierarchy in User Settings

See merge request gitlab-org/gitlab-ce!16090
parents cdda83eb 05b97af3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row.prepend-top-default .row.prepend-top-default
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h3.prepend-top-0 %h4.prepend-top-0
= page_title = page_title
%p %p
This is a security log of important events involving your account. This is a security log of important events involving your account.
......
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
%li= msg %li= msg
= hidden_field_tag :notification_type, 'global' = hidden_field_tag :notification_type, 'global'
.row .row.prepend-top-default
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar
%h4 %h4.prepend-top-0
= page_title = page_title
%p %p
You can specify notification level per group or per project. You can specify notification level per group or per project.
%p %p
By default, all projects and groups will use the global notifications setting. By default, all projects and groups will use the global notifications setting.
.col-lg-8 .col-lg-8
%h5 %h5.prepend-top-0
Global notification settings Global notification settings
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f|
......
---
title: Keep typographic hierarchy in User Settings
merge_request: 16090
author: George Tsiolis
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment