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

Keep typographic hierarchy in User Settings 

- Authentication log
- Notifications
This commit is contained in:
George Tsiolis 2017-12-29 01:20:05 +02:00
parent 54229d3e45
commit 05b97af343
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/profiles/audit_log.html.haml
View File

@ -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.

6
app/views/profiles/notifications/show.html.haml
View File

@ -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|

5
changelogs/unreleased/fix-profile-settings-sidebar-heading.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Keep typographic hierarchy in User Settings
merge_request: 16090
author: George Tsiolis
type: fixed