diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 04:30:57 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 04:30:57 +0000 |
| commit | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (patch) | |
| tree | 2fa10fd745c2e1e012c22db6f02593db85ae36a0 /app/assets | |
| parent | 222e53a026fc4470737d03c358db97cf11c5e029 (diff) | |
| parent | beece83af1788e587dc6e14c6feb1dea5c8f9b97 (diff) | |
| download | gitlab-ce-6cf189f0a92772b9174f913e7c74a4889d54e9a6.tar.gz | |
Merge branch 'improve-avatar-header' into 'master'
Improve header with avatar for group and user pages
Nice looking and aligned headers for user and group pages
See merge request !412
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 19 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 876eea72e8a..db393e08819 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -355,3 +355,22 @@ table { bottom: 20px !important; left: 20px !important; } + +.header-with-avatar { + h3 { + margin: 0; + font-weight: bold; + } + + .username { + font-size: 18px; + color: #666; + margin-top: 8px; + } + + .description { + font-size: 16px; + color: #666; + margin-top: 8px; + } +} diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 81afe05162f..fbe71a5b5ad 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -41,11 +41,6 @@ } } -.user-show-username { - font-weight: 200; - color: #666; -} - /* * Appearance settings * |