From adb8753b605ecf5639294c6962c4102adc98f765 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 3 Mar 2016 16:41:14 +0100 Subject: [PATCH 1/2] fix uppercase error for avatars --- app/components/user-avatar.js | 4 ++-- app/styles/app/modules/avatar.sass | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/user-avatar.js b/app/components/user-avatar.js index f37d9f93..be6d362a 100644 --- a/app/components/user-avatar.js +++ b/app/components/user-avatar.js @@ -8,14 +8,14 @@ export default Ember.Component.extend({ userInitials: function() { var name = this.get('name'); var arr = name.split(' '); - var initials; + var initials = ''; if (arr.length >= 2) { initials = arr[0].split('')[0] + arr[1].split('')[0]; } else { initials = arr[0].split('')[0]; } - return initials.toUpperCase(); + return initials; }.property('userInitials') }); diff --git a/app/styles/app/modules/avatar.sass b/app/styles/app/modules/avatar.sass index 9c412b09..c2c60b5f 100644 --- a/app/styles/app/modules/avatar.sass +++ b/app/styles/app/modules/avatar.sass @@ -30,6 +30,7 @@ text-align: center font-size: 1.4em line-height: 1.6 + text-transform: uppercase .real-avatar +absoluteCenter From c31d87871b10cd1ab5956ef89790bb408fdcc03c Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 3 Mar 2016 17:02:28 +0100 Subject: [PATCH 2/2] fix sync button label --- app/styles/app/components/sync-button.sass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/styles/app/components/sync-button.sass b/app/styles/app/components/sync-button.sass index cb4c8ed4..82b74087 100644 --- a/app/styles/app/components/sync-button.sass +++ b/app/styles/app/components/sync-button.sass @@ -2,6 +2,7 @@ vertical-align: middle display: flex flex-flow: row-reverse wrap + position: relative .button position: relative z-index: 2 @@ -14,11 +15,14 @@ &:hover background-color: $oxide-blue .sync-last - position: relative + position: absolute + left: -15em + top: 0 z-index: -1 transition: transform 150ms ease, opacity 250ms ease transform: translateX(80%) opacity: 0 + background: white .button:hover ~ .sync-last transform: translateX(0) opacity: 1