From 77eccea2c9b5279464815e2302e74b34745dbd47 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 23 Mar 2016 15:14:42 +0100 Subject: [PATCH] avatar: add size 30, fix unique scaled avatar background --- app/assets/javascripts/app/models/user.coffee | 5 +++-- app/assets/stylesheets/zammad.scss | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index ad891d37d..b26cc7e8f 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -48,6 +48,7 @@ class App.User extends App.Model return '??' avatar: (size = 40, placement = '', cssClass = '', unique = false, avatar, type = undefined) -> + baseSize = 40 size = parseInt(size, 10) cssClass += ' ' if cssClass @@ -92,8 +93,8 @@ class App.User extends App.Model cssClass: cssClass placement: placement vip: vip - x: x - y: y + x: x * size/baseSize + y: y * size/baseSize initials: @initials() # generate image based avatar diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index e8c08d990..51724dd25 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -3381,6 +3381,11 @@ footer { vertical-align: bottom; position: relative; + &.size-30 { + width: 30px; + height: 30px; + } + .icon-crown { position: absolute; width: 28px; @@ -3414,7 +3419,7 @@ footer { &.unique { background-image: image_url("/assets/images/avatar-bg.png"); - background-size: auto; + background-size: 300px 226px; color: white; line-height: 40px; text-align: center; @@ -3423,15 +3428,23 @@ footer { text-transform: uppercase; text-shadow: 0 1px rgba(0,0,0,.2); cursor: default; + + &.size-30 { + font-size: 10px; + line-height: 32px; + background-size: 225px 170px; + } &.size-50 { font-size: 16px; line-height: 52px; + background-size: 375px 283px; } &.size-80 { - font-size: 20px; + font-size: 26px; line-height: 84px; + background-size: 600px 452px; } }