diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-20 18:35:43 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 12:26:24 -0200 |
| commit | c7e0381c07e56df70e3d6fe3bba2b33a5657f18c (patch) | |
| tree | 55c52cbaf25f2578fe41956d092b0eec37168b45 | |
| parent | a8936a9acd085a583fca6cef6067cbf2297a8284 (diff) | |
| download | gitlab-ce-c7e0381c07e56df70e3d6fe3bba2b33a5657f18c.tar.gz | |
Merge branch 'avatar-circles' into 'master'
Fix sizing of avatar circles; add border
* Adds border to group and project avatars
* Fixes cut-off circles
Closes #25733
See merge request !8194
| -rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index 000e591e09c..48827578d94 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -64,7 +64,7 @@ &.s32 { font-size: 20px; line-height: 30px; } &.s40 { font-size: 16px; line-height: 38px; } &.s60 { font-size: 32px; line-height: 58px; } - &.s70 { font-size: 34px; line-height: 68px; } + &.s70 { font-size: 34px; line-height: 70px; } &.s90 { font-size: 36px; line-height: 88px; } &.s110 { font-size: 40px; line-height: 108px; font-weight: 300; } &.s140 { font-size: 72px; line-height: 138px; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a443b6a37b3..e16a553bcda 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -93,7 +93,6 @@ .group-avatar { float: none; margin: 0 auto; - border: none; &.identicon { border-radius: 50%; |