From d454b5de2b03111a05c4e8a8b0a91e612b8f0266 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 31 May 2018 13:20:15 -0230
Subject: Token name is not hidden in wallet if balance is exceptionally long.

---
 ui/app/css/itcss/components/token-list.scss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/token-list.scss b/ui/app/css/itcss/components/token-list.scss
index e8de317e3..214bbc774 100644
--- a/ui/app/css/itcss/components/token-list.scss
+++ b/ui/app/css/itcss/components/token-list.scss
@@ -14,10 +14,16 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
   min-width: 0;
 
   &__token-balance {
-    font-size: 1.5rem;
+    margin-right: 4px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    flex: 1;
+  }
+
+  &__token-balance, &__token-symbol {
+    font-size: 1.5rem;
+    display: inline-flex;
 
     @media #{$wallet-balance-breakpoint-range} {
       font-size: 95%;
@@ -68,6 +74,8 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
   &__balance-wrapper {
     flex: 1 1 auto;
     min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 
-- 
cgit v1.2.3


From fd98ed570e09faf12ac10e6340225fd586914558 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Thu, 31 May 2018 11:16:41 -0700
Subject: Fix ellipses

---
 ui/app/css/itcss/components/token-list.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/token-list.scss b/ui/app/css/itcss/components/token-list.scss
index 214bbc774..72fda372f 100644
--- a/ui/app/css/itcss/components/token-list.scss
+++ b/ui/app/css/itcss/components/token-list.scss
@@ -18,12 +18,13 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    flex: 1;
+    min-width: 0;
+    max-width: 100%;
   }
 
   &__token-balance, &__token-symbol {
     font-size: 1.5rem;
-    display: inline-flex;
+    flex: 0 0 auto;
 
     @media #{$wallet-balance-breakpoint-range} {
       font-size: 95%;
@@ -72,10 +73,10 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
   }
 
   &__balance-wrapper {
-    flex: 1 1 auto;
+    flex: 1;
+    flex-flow: row wrap;
+    display: flex;
     min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
   }
 }
 
-- 
cgit v1.2.3


From 5a2771dd470161f5678e3245f90aeb3a1ce1b89c Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@users.noreply.github.com>
Date: Mon, 4 Jun 2018 09:33:25 -0700
Subject: Indicate the current selected account on the popup account view
 (#4445)

---
 ui/app/css/itcss/components/account-menu.scss | 4 ++++
 ui/app/css/itcss/components/hero-balance.scss | 1 +
 2 files changed, 5 insertions(+)

(limited to 'ui/app/css/itcss')

diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss
index 657760ab5..96fba890c 100644
--- a/ui/app/css/itcss/components/account-menu.scss
+++ b/ui/app/css/itcss/components/account-menu.scss
@@ -116,6 +116,10 @@
   &__name {
     color: $white;
     font-size: 18px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 200px;
   }
 
   &__balance {
diff --git a/ui/app/css/itcss/components/hero-balance.scss b/ui/app/css/itcss/components/hero-balance.scss
index 69cde8a0f..09d66aedd 100644
--- a/ui/app/css/itcss/components/hero-balance.scss
+++ b/ui/app/css/itcss/components/hero-balance.scss
@@ -6,6 +6,7 @@
     justify-content: flex-start;
     align-items: center;
     flex: 0 0 auto;
+    padding-top: 16px;
   }
 
   @media screen and (min-width: $break-large) {
-- 
cgit v1.2.3