From d46a79df25afa0973f19210048b929fa5ba76117 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 13:24:06 -0700 Subject: Organize app components scss --- ui/app/css/itcss/components/newui-sections.scss | 109 ++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 ui/app/css/itcss/components/newui-sections.scss (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss new file mode 100644 index 000000000..23cf4a39a --- /dev/null +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -0,0 +1,109 @@ +/* + NewUI Container Elements + */ + +.main-container { + position: absolute; + z-index: 18; + box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); + font-family: DIN OT; + display: flex; + flex-wrap: wrap; + align-items: stretch; + overflow-y: scroll; +} + +.sidebar { + flex: 1 0 230px; + background: rgb(250, 250, 250); + z-index: 26; + position: fixed; + top: 35px; + left: 0px; + right: 0px; + bottom: 0px; + opacity: 1; + visibility: visible; + will-change: transform; + overflow-y: auto; + box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 4px; + width: 85%; + height: 100%; +} + +.sidebar-overlay { + z-index: 25; + position: fixed; + top: 35px; + left: 0px; + right: 0px; + bottom: 0px; + opacity: 1; + visibility: visible; + background-color: rgba(0, 0, 0, 0.3); +} + +@media screen and (min-width: 576px) { + .lap-visible { + display: flex; + } + + .phone-visible { + display: none; + } + + .main-container { + margin-top: 35px; + width: 85%; + height: 90vh; + } + + button.btn-clear { + width: 75px; + height: 32px; + font-size: .6em; + background: white; + border: 1px solid; + } +} + +@media screen and (min-width: 769px) { + .main-container { + margin-top: 35px; + width: 80%; + height: 82vh; + } +} + +@media screen and (min-width: 1281px) { + .main-container { + margin-top: 35px; + width: 65%; + height: 82vh; + } +} + +@media screen and (max-width: 575px) { + .lap-visible { + display: none; + } + + .phone-visible { + display: flex; + } + + .main-container { + margin-top: 35px; + // position: relative; + width: 100%; + height: 100%; + } + + button.btn-clear { + width: 100px; + height: 50px; + font-size: .7em; + background: red; + border: 1px solid; + } +} -- cgit From 2eddfec3423b5ca72f1619f4daf9567c757e4896 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 13:46:11 -0700 Subject: Remove output folder --- ui/app/css/itcss/components/newui-sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 23cf4a39a..b3ad30017 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -103,7 +103,7 @@ width: 100px; height: 50px; font-size: .7em; - background: red; + background: white; border: 1px solid; } } -- cgit From c1b85179590e824e9af93da5c1c67ef3a5eb1d06 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 16:37:41 -0700 Subject: Normalize sidebar dimensions and adjust hero button responsiveness --- ui/app/css/itcss/components/newui-sections.scss | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index b3ad30017..f087d2651 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -57,14 +57,6 @@ width: 85%; height: 90vh; } - - button.btn-clear { - width: 75px; - height: 32px; - font-size: .6em; - background: white; - border: 1px solid; - } } @media screen and (min-width: 769px) { @@ -100,7 +92,7 @@ } button.btn-clear { - width: 100px; + width: 93px; height: 50px; font-size: .7em; background: white; -- cgit From a7017b824d108bbf81b8dbc994d451829c2413db Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 18:50:23 -0700 Subject: Refactor app-header css, including box shadow and z-index --- ui/app/css/itcss/components/newui-sections.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index f087d2651..39cdc507a 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -2,10 +2,10 @@ NewUI Container Elements */ +// Main container .main-container { position: absolute; z-index: 18; - box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); font-family: DIN OT; display: flex; flex-wrap: wrap; @@ -56,6 +56,7 @@ margin-top: 35px; width: 85%; height: 90vh; + box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); } } @@ -64,6 +65,7 @@ margin-top: 35px; width: 80%; height: 82vh; + box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); } } @@ -72,6 +74,7 @@ margin-top: 35px; width: 65%; height: 82vh; + box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); } } @@ -86,7 +89,6 @@ .main-container { margin-top: 35px; - // position: relative; width: 100%; height: 100%; } -- cgit From 850d2124c81ee81b98f23be1f49db13ca5e8aa27 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 19:26:52 -0700 Subject: Refactor account name css - mobile views --- ui/app/css/itcss/components/newui-sections.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 39cdc507a..761e74561 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -101,3 +101,9 @@ border: 1px solid; } } + +// wallet view +.account-name { + font-size: 102%; + margin-left: 3%; +} -- cgit From 29662ff7b48c9cc8fc68cae6ba1e5a1f81ddf1c0 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 20:47:59 -0700 Subject: Move tx and wallet view styles to component classes --- ui/app/css/itcss/components/newui-sections.scss | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 761e74561..02acfca47 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -13,7 +13,21 @@ overflow-y: scroll; } -.sidebar { + +// tx view +.tx-view { + flex: 63.5 0 66.5%; + background: '#FFFFFF'; // TODO: add to resuable colors +} + +.wallet-view { + flex: 33.5 0 33.5%; + background: #FAFAFA, // TODO: add to reusable colors +} + +// wallet view + +.wallet-view.sidebar { flex: 1 0 230px; background: rgb(250, 250, 250); z-index: 26; -- cgit From ba50411bb2247d783667142cc5e7efff1bf839de Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 21:54:42 -0700 Subject: Position account icon, name, and caret --- ui/app/css/itcss/components/newui-sections.scss | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 02acfca47..684e998d5 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -15,17 +15,27 @@ // tx view + .tx-view { flex: 63.5 0 66.5%; - background: '#FFFFFF'; // TODO: add to resuable colors + background: #FFFFFF; // TODO: add to resuable colors } + +// wallet view + .wallet-view { flex: 33.5 0 33.5%; background: #FAFAFA, // TODO: add to reusable colors } -// wallet view +.account-options-menu { + align-items: center; + justify-content: flex-start; + margin: 5% 7%; +} + + .wallet-view.sidebar { flex: 1 0 230px; @@ -118,6 +128,13 @@ // wallet view .account-name { - font-size: 102%; - margin-left: 3%; + @media screen and (max-width: 575px) { + font-size: 102%; + margin-left: 3%; + } + + @media screen and (max-width: 575px) { + text-align: center; + } + } -- cgit From 0f140c5db59e72836ec437063314b39f33bae100 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 22:30:27 -0700 Subject: Improve positioning of caret and add reusable color for wallet view --- ui/app/css/itcss/components/newui-sections.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 684e998d5..d5ea8be1b 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -18,7 +18,7 @@ .tx-view { flex: 63.5 0 66.5%; - background: #FFFFFF; // TODO: add to resuable colors + background: $white; // TODO: add to resuable colors } @@ -26,7 +26,7 @@ .wallet-view { flex: 33.5 0 33.5%; - background: #FAFAFA, // TODO: add to reusable colors + background: $wild-sand, } .account-options-menu { -- cgit From 8a39941d9a4c5b6fd4a3715394fec10c400c0f34 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 10 Aug 2017 23:21:39 -0700 Subject: Cleanup SCSS and improve organization of color vars --- ui/app/css/itcss/components/newui-sections.scss | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index d5ea8be1b..a9167dfb8 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -2,6 +2,10 @@ NewUI Container Elements */ +// Component Colors +$tx-view-bg: $white; +$wallet-view-bg: $wild-sand; + // Main container .main-container { position: absolute; @@ -13,20 +17,18 @@ overflow-y: scroll; } - // tx view .tx-view { flex: 63.5 0 66.5%; - background: $white; // TODO: add to resuable colors + background: $tx-view-bg; } - // wallet view .wallet-view { flex: 33.5 0 33.5%; - background: $wild-sand, + background: $wallet-view-bg, } .account-options-menu { @@ -35,8 +37,6 @@ margin: 5% 7%; } - - .wallet-view.sidebar { flex: 1 0 230px; background: rgb(250, 250, 250); @@ -136,5 +136,4 @@ @media screen and (max-width: 575px) { text-align: center; } - } -- cgit From 0fab1b54820aec01d3b4e7c2c351da57769647ee Mon Sep 17 00:00:00 2001 From: sdtsui Date: Fri, 11 Aug 2017 00:31:06 -0700 Subject: Implement responsive wallet balances --- ui/app/css/itcss/components/newui-sections.scss | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index a9167dfb8..01c69f818 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -28,7 +28,22 @@ $wallet-view-bg: $wild-sand; .wallet-view { flex: 33.5 0 33.5%; - background: $wallet-view-bg, + background: $wallet-view-bg; + overflow-y: scroll; +} + +.wallet-view-title-wrapper { + height: 25px; +} + +.wallet-view-title { + margin-left: 15px; + font-size: 16px; + + // No title on mobile + @media screen and (max-width: 575px) { + display: none; + } } .account-options-menu { -- cgit From f23d8c7393732ba2ed3c98f7eead9beb02cd0e92 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Fri, 11 Aug 2017 00:42:09 -0700 Subject: Allow fullscreen scrolling on mobile view, while retaining in-window scroll for laptop --- ui/app/css/itcss/components/newui-sections.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 01c69f818..edf5d0966 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -29,7 +29,10 @@ $wallet-view-bg: $wild-sand; .wallet-view { flex: 33.5 0 33.5%; background: $wallet-view-bg; - overflow-y: scroll; + + @media screen and (min-width: 576px) { + overflow-y: scroll; + } } .wallet-view-title-wrapper { @@ -129,7 +132,6 @@ $wallet-view-bg: $wild-sand; .main-container { margin-top: 35px; width: 100%; - height: 100%; } button.btn-clear { -- cgit From 9b48e0aa53ff73fe526c4788c929b0ffe5a2d499 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Fri, 11 Aug 2017 09:17:14 -0700 Subject: Implement infinite scrolls (no lazy loading) for wallet view --- ui/app/css/itcss/components/newui-sections.scss | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index edf5d0966..afda29cd5 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -24,19 +24,25 @@ $wallet-view-bg: $wild-sand; background: $tx-view-bg; } -// wallet view +// wallet view and sidebar .wallet-view { + display: flex; + flex-direction: column; flex: 33.5 0 33.5%; background: $wallet-view-bg; @media screen and (min-width: 576px) { overflow-y: scroll; } + + .wallet-view-account-details { + flex: 0 0 150px; + } } .wallet-view-title-wrapper { - height: 25px; + flex: 0 0 25px; } .wallet-view-title { @@ -49,12 +55,6 @@ $wallet-view-bg: $wild-sand; } } -.account-options-menu { - align-items: center; - justify-content: flex-start; - margin: 5% 7%; -} - .wallet-view.sidebar { flex: 1 0 230px; background: rgb(250, 250, 250); @@ -85,6 +85,8 @@ $wallet-view-bg: $wild-sand; background-color: rgba(0, 0, 0, 0.3); } +// main-container media queries + @media screen and (min-width: 576px) { .lap-visible { display: flex; @@ -154,3 +156,10 @@ $wallet-view-bg: $wild-sand; text-align: center; } } + +// account options dropdown +.account-options-menu { + align-items: center; + justify-content: flex-start; + margin: 5% 7%; +} \ No newline at end of file -- cgit From 2eadf72fb772b5b6bd32f04c9d439cc0f1ab0453 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Mon, 14 Aug 2017 10:31:27 +0200 Subject: Lint and cleanup all scss --- ui/app/css/itcss/components/newui-sections.scss | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index afda29cd5..7daf72bf2 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -10,7 +10,7 @@ $wallet-view-bg: $wild-sand; .main-container { position: absolute; z-index: 18; - font-family: DIN OT; + font-family: "DIN OT"; display: flex; flex-wrap: wrap; align-items: stretch; @@ -61,14 +61,14 @@ $wallet-view-bg: $wild-sand; z-index: 26; position: fixed; top: 35px; - left: 0px; - right: 0px; - bottom: 0px; + left: 0; + right: 0; + bottom: 0; opacity: 1; visibility: visible; will-change: transform; overflow-y: auto; - box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 4px; + box-shadow: rgba(0, 0, 0, .15) 2px 2px 4px; width: 85%; height: 100%; } @@ -77,12 +77,12 @@ $wallet-view-bg: $wild-sand; z-index: 25; position: fixed; top: 35px; - left: 0px; - right: 0px; - bottom: 0px; + left: 0; + right: 0; + bottom: 0; opacity: 1; visibility: visible; - background-color: rgba(0, 0, 0, 0.3); + background-color: rgba(0, 0, 0, .3); } // main-container media queries @@ -100,7 +100,7 @@ $wallet-view-bg: $wild-sand; margin-top: 35px; width: 85%; height: 90vh; - box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); } } @@ -109,7 +109,7 @@ $wallet-view-bg: $wild-sand; margin-top: 35px; width: 80%; height: 82vh; - box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); } } @@ -118,7 +118,7 @@ $wallet-view-bg: $wild-sand; margin-top: 35px; width: 65%; height: 82vh; - box-shadow: 0 0 7px 0 rgba(0,0,0,0.08); + box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); } } @@ -140,13 +140,14 @@ $wallet-view-bg: $wild-sand; width: 93px; height: 50px; font-size: .7em; - background: white; + background: $white; border: 1px solid; } } // wallet view .account-name { + @media screen and (max-width: 575px) { font-size: 102%; margin-left: 3%; @@ -162,4 +163,4 @@ $wallet-view-bg: $wild-sand; align-items: center; justify-content: flex-start; margin: 5% 7%; -} \ No newline at end of file +} -- cgit From 5900cc8522176edf5263b5bc0cda520f8d311db0 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Tue, 22 Aug 2017 08:37:15 -0700 Subject: Tweak z-indicies --- ui/app/css/itcss/components/newui-sections.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 7daf72bf2..33fbc83e6 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -9,7 +9,7 @@ $wallet-view-bg: $wild-sand; // Main container .main-container { position: absolute; - z-index: 18; + z-index: $main-container-z-index; font-family: "DIN OT"; display: flex; flex-wrap: wrap; @@ -58,7 +58,7 @@ $wallet-view-bg: $wild-sand; .wallet-view.sidebar { flex: 1 0 230px; background: rgb(250, 250, 250); - z-index: 26; + z-index: $sidebar-z-index; position: fixed; top: 35px; left: 0; @@ -74,7 +74,7 @@ $wallet-view-bg: $wild-sand; } .sidebar-overlay { - z-index: 25; + z-index: $sidebar-overlay-z-index; position: fixed; top: 35px; left: 0; -- cgit From 799627189d62296cdec8f9604169d661123dec38 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 30 Aug 2017 21:32:13 -0230 Subject: Fix margin, padding, height for header. --- ui/app/css/itcss/components/newui-sections.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 33fbc83e6..288a3650d 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -106,7 +106,7 @@ $wallet-view-bg: $wild-sand; @media screen and (min-width: 769px) { .main-container { - margin-top: 35px; + margin-top: 6.9vh; width: 80%; height: 82vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); @@ -115,7 +115,7 @@ $wallet-view-bg: $wild-sand; @media screen and (min-width: 1281px) { .main-container { - margin-top: 35px; + margin-top: 6.9vh; width: 65%; height: 82vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); @@ -162,5 +162,5 @@ $wallet-view-bg: $wild-sand; .account-options-menu { align-items: center; justify-content: flex-start; - margin: 5% 7%; + margin: 5% 7% 0%; } -- cgit From 75c3009f839f94a19830673673f4b9ac25342633 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Mon, 4 Sep 2017 15:55:14 -0700 Subject: Fix header style; Address comments --- ui/app/css/itcss/components/newui-sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 288a3650d..5c5d16ef3 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -97,7 +97,7 @@ $wallet-view-bg: $wild-sand; } .main-container { - margin-top: 35px; + margin-top: 6.9vh; width: 85%; height: 90vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); -- cgit From 5d8bf6c86ad9cee9aec5e14ca9d57719e6e8e254 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 30 Aug 2017 22:27:08 -0230 Subject: Adjust left margin in main container. --- ui/app/css/itcss/components/newui-sections.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 5c5d16ef3..a140eb0f6 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -10,7 +10,7 @@ $wallet-view-bg: $wild-sand; .main-container { position: absolute; z-index: $main-container-z-index; - font-family: "DIN OT"; + font-family: "DIN OT Light"; display: flex; flex-wrap: wrap; align-items: stretch; -- cgit From 7d6ad48f15aa65d28de724f550f911234ad2c58e Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 31 Aug 2017 04:58:45 -0230 Subject: Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content.. --- ui/app/css/itcss/components/newui-sections.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index a140eb0f6..aa874caf5 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -14,7 +14,10 @@ $wallet-view-bg: $wild-sand; display: flex; flex-wrap: wrap; align-items: stretch; - overflow-y: scroll; +} + +.main-container::-webkit-scrollbar { + display: none; } // tx view -- cgit From 6ef483be4a564cfc368a732b89c01b74ff1c4913 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 31 Aug 2017 05:07:42 -0230 Subject: Remove wallet-view scrollbars. --- ui/app/css/itcss/components/newui-sections.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index aa874caf5..f5accca8a 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -44,6 +44,12 @@ $wallet-view-bg: $wild-sand; } } +@media screen and (min-width: 576px) { + .wallet-view::-webkit-scrollbar { + display: none; + } +} + .wallet-view-title-wrapper { flex: 0 0 25px; } -- cgit From 06b2a04a4259a0bc7dff4004328441d353c296de Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 5 Sep 2017 01:48:52 -0700 Subject: Implement tokens list UI --- ui/app/css/itcss/components/newui-sections.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index f5accca8a..53c0023c3 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -6,6 +6,13 @@ $tx-view-bg: $white; $wallet-view-bg: $wild-sand; +html { + + @media screen and (max-width: 575px) { + height: 500px; + } +} + // Main container .main-container { position: absolute; @@ -17,7 +24,7 @@ $wallet-view-bg: $wild-sand; } .main-container::-webkit-scrollbar { - display: none; + display: none; } // tx view @@ -37,6 +44,7 @@ $wallet-view-bg: $wild-sand; @media screen and (min-width: 576px) { overflow-y: scroll; + overflow-x: hidden; } .wallet-view-account-details { @@ -142,7 +150,10 @@ $wallet-view-bg: $wild-sand; .main-container { margin-top: 35px; + height: calc(100% - 34px); width: 100%; + overflow-y: auto; + background-color: $white; } button.btn-clear { -- cgit From 983fa2a11721aa7d1307ef76d516e25a50d0eedf Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 7 Sep 2017 03:14:53 -0700 Subject: Add Contract Tx List Item; Update Token Tx on select --- ui/app/css/itcss/components/newui-sections.scss | 7 ------- 1 file changed, 7 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 53c0023c3..b576e5ca5 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -6,13 +6,6 @@ $tx-view-bg: $white; $wallet-view-bg: $wild-sand; -html { - - @media screen and (max-width: 575px) { - height: 500px; - } -} - // Main container .main-container { position: absolute; -- cgit From 35d8671843ff15822488ae39310c8c12818fb1a3 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 14 Sep 2017 09:56:40 -0700 Subject: Add responsive UI to send ether modal --- ui/app/css/itcss/components/newui-sections.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index b576e5ca5..ae6ee6311 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -70,7 +70,7 @@ $wallet-view-bg: $wild-sand; background: rgb(250, 250, 250); z-index: $sidebar-z-index; position: fixed; - top: 35px; + top: 41px; left: 0; right: 0; bottom: 0; @@ -86,7 +86,7 @@ $wallet-view-bg: $wild-sand; .sidebar-overlay { z-index: $sidebar-overlay-z-index; position: fixed; - top: 35px; + top: 41px; left: 0; right: 0; bottom: 0; @@ -142,8 +142,8 @@ $wallet-view-bg: $wild-sand; } .main-container { - margin-top: 35px; - height: calc(100% - 34px); + margin-top: 41px; + height: calc(100% - 41px); width: 100%; overflow-y: auto; background-color: $white; -- cgit From 06292107d756f0b25805f819cd276e4b6303ccb0 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 28 Sep 2017 16:13:53 -0700 Subject: Always set currency to USD on app mount --- ui/app/css/itcss/components/newui-sections.scss | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index ae6ee6311..5ce4f281c 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -177,3 +177,11 @@ $wallet-view-bg: $wild-sand; justify-content: flex-start; margin: 5% 7% 0%; } + +.fiat-amount { + text-transform: uppercase; +} + +.token-balance__amount { + padding-right: 6px; +} -- cgit From 57179d2b05a4efae06c2375e01e9a01a5519543b Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 12 Oct 2017 18:46:09 -0400 Subject: Various styling fixes --- ui/app/css/itcss/components/newui-sections.scss | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'ui/app/css/itcss/components/newui-sections.scss') diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 5ce4f281c..fc1dba87c 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -8,9 +8,9 @@ $wallet-view-bg: $wild-sand; // Main container .main-container { - position: absolute; + // position: absolute; z-index: $main-container-z-index; - font-family: "DIN OT Light"; + font-family: Roboto; display: flex; flex-wrap: wrap; align-items: stretch; @@ -70,7 +70,7 @@ $wallet-view-bg: $wild-sand; background: rgb(250, 250, 250); z-index: $sidebar-z-index; position: fixed; - top: 41px; + // top: 41px; left: 0; right: 0; bottom: 0; @@ -86,7 +86,9 @@ $wallet-view-bg: $wild-sand; .sidebar-overlay { z-index: $sidebar-overlay-z-index; position: fixed; - top: 41px; + // top: 41px; + height: 100%; + width: 100%; left: 0; right: 0; bottom: 0; @@ -107,7 +109,7 @@ $wallet-view-bg: $wild-sand; } .main-container { - margin-top: 6.9vh; + // margin-top: 6.9vh; width: 85%; height: 90vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); @@ -116,7 +118,7 @@ $wallet-view-bg: $wild-sand; @media screen and (min-width: 769px) { .main-container { - margin-top: 6.9vh; + // margin-top: 6.9vh; width: 80%; height: 82vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); @@ -125,7 +127,7 @@ $wallet-view-bg: $wild-sand; @media screen and (min-width: 1281px) { .main-container { - margin-top: 6.9vh; + // margin-top: 6.9vh; width: 65%; height: 82vh; box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08); @@ -142,8 +144,8 @@ $wallet-view-bg: $wild-sand; } .main-container { - margin-top: 41px; - height: calc(100% - 41px); + // margin-top: 41px; + height: 100%; width: 100%; overflow-y: auto; background-color: $white; -- cgit