From 65bc783767c59ecad2f0d2951d6129388e75cab0 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 24 May 2019 14:49:49 +0200 Subject: [PATCH] Increase avatars in WP table --- app/assets/stylesheets/content/_user.lsg | 3 +++ app/assets/stylesheets/content/_user.sass | 19 ++++++++++++++----- .../user-field-portal.component.html | 2 +- lib/open_project/design.rb | 3 +++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/content/_user.lsg b/app/assets/stylesheets/content/_user.lsg index 68b78d140b..deda13d988 100644 --- a/app/assets/stylesheets/content/_user.lsg +++ b/app/assets/stylesheets/content/_user.lsg @@ -11,6 +11,9 @@ Standard Mini:
Default:
OA


+Default Medium:
+
OA
+

Default Mini:
OA


diff --git a/app/assets/stylesheets/content/_user.sass b/app/assets/stylesheets/content/_user.sass index d6a8f774b8..cf2ac0d036 100644 --- a/app/assets/stylesheets/content/_user.sass +++ b/app/assets/stylesheets/content/_user.sass @@ -32,14 +32,23 @@ height: $user-avatar-height .avatar-mini - border-radius: $user-avatar-mini-border-radius + border-radius: $user-avatar-medium-border-radius width: $user-avatar-mini-width height: $user-avatar-mini-height - margin-right: 10px - vertical-align: -5px + vertical-align: + margin-right: 10px -5px + + &.avatar-default + line-height: $user-avatar-mini-height + font-size: 13px + +.avatar-medium + border-radius: $user-avatar-mini-border-radius + width: $user-avatar-medium-width + height: $user-avatar-medium-height &.avatar-default - line-height: 20px + line-height: $user-avatar-medium-height font-size: 10px .avatar-default @@ -54,7 +63,7 @@ user-select: none h1, h2, h3, h4, tr - .avatar, .avatar-mini + .avatar, .avatar-mini, .avatar-medium vertical-align: middle margin-right: 7px diff --git a/frontend/src/app/modules/fields/display/display-portal/display-user-field-portal/user-field-portal.component.html b/frontend/src/app/modules/fields/display/display-portal/display-user-field-portal/user-field-portal.component.html index e5c1ee503d..f9f63d9cd8 100644 --- a/frontend/src/app/modules/fields/display/display-portal/display-user-field-portal/user-field-portal.component.html +++ b/frontend/src/app/modules/fields/display/display-portal/display-user-field-portal/user-field-portal.component.html @@ -1,7 +1,7 @@ + data-class-list="avatar-medium"> , diff --git a/lib/open_project/design.rb b/lib/open_project/design.rb index 82f3a0da0d..c3c182bd82 100644 --- a/lib/open_project/design.rb +++ b/lib/open_project/design.rb @@ -147,6 +147,9 @@ module OpenProject 'user-avatar-border-radius' => "50%", 'user-avatar-width' => "36px", 'user-avatar-height' => "36px", + 'user-avatar-medium-border-radius' => "50%", + 'user-avatar-medium-width' => "28px", + 'user-avatar-medium-height' => "28px", 'user-avatar-mini-border-radius' => "50%", 'user-avatar-mini-width' => "20px", 'user-avatar-mini-height' => "20px",