diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 19:37:20 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-03 19:37:20 +0000 |
| commit | ba869ae50d0c43867f7d34a4f7e08520c1e4c7f1 (patch) | |
| tree | ae40280ee53ec83710bd58fda0befd234d7e1bac /app/assets | |
| parent | bd269eaab993c4f2faa03e0e3a5cef72a82d3f2b (diff) | |
| parent | 8df4a70887bdc07971e548d2d1c45cd389f5627b (diff) | |
| download | gitlab-ce-ba869ae50d0c43867f7d34a4f7e08520c1e4c7f1.tar.gz | |
Merge branch 'password-settings' into 'master'
Password settings page
Closes #13858
See merge request !3033
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 726dcbb36a9..a635e49a7bc 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -5,12 +5,6 @@ } } -.profile-settings-sidebar { - a { - color: $profile-settings-link-color; - } -} - .avatar-image { @media (min-width: $screen-sm-min) { float: left; @@ -24,6 +18,11 @@ display: inline-block; } +.account-btn-link, +.profile-settings-sidebar a { + color: $profile-settings-link-color; +} + .oauth-buttons { .btn-group { margin-right: 10px; |