From f5dabcc2186b4274797fab40cfab17e568a8f021 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Feb 2016 18:24:13 -0300 Subject: [PATCH 1/2] Cleaning main screen --- public/img/icon-bws-white.svg | 1 + public/img/icon-ledger-white.svg | 1 + public/img/icon-lock-white.svg | 1 + public/img/icon-read-only-white.svg | 1 + public/img/icon-sync-white.svg | 1 + public/img/icon-testnet-white.svg | 1 + public/img/icon-trezor-white.svg | 1 + public/views/includes/walletInfo.html | 22 ++++++++++-------- public/views/walletHome.html | 33 +++++---------------------- src/css/main.css | 6 +++-- src/css/mobile.css | 23 ++++++++----------- 11 files changed, 40 insertions(+), 51 deletions(-) create mode 100644 public/img/icon-bws-white.svg create mode 100644 public/img/icon-ledger-white.svg create mode 100644 public/img/icon-lock-white.svg create mode 100644 public/img/icon-read-only-white.svg create mode 100644 public/img/icon-sync-white.svg create mode 100644 public/img/icon-testnet-white.svg create mode 100644 public/img/icon-trezor-white.svg diff --git a/public/img/icon-bws-white.svg b/public/img/icon-bws-white.svg new file mode 100644 index 000000000..ab84e6326 --- /dev/null +++ b/public/img/icon-bws-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-ledger-white.svg b/public/img/icon-ledger-white.svg new file mode 100644 index 000000000..f320cba64 --- /dev/null +++ b/public/img/icon-ledger-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-lock-white.svg b/public/img/icon-lock-white.svg new file mode 100644 index 000000000..1577af73f --- /dev/null +++ b/public/img/icon-lock-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-read-only-white.svg b/public/img/icon-read-only-white.svg new file mode 100644 index 000000000..eb08d3389 --- /dev/null +++ b/public/img/icon-read-only-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-sync-white.svg b/public/img/icon-sync-white.svg new file mode 100644 index 000000000..eecb08f69 --- /dev/null +++ b/public/img/icon-sync-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-testnet-white.svg b/public/img/icon-testnet-white.svg new file mode 100644 index 000000000..2e300a23c --- /dev/null +++ b/public/img/icon-testnet-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icon-trezor-white.svg b/public/img/icon-trezor-white.svg new file mode 100644 index 000000000..d0f648f0e --- /dev/null +++ b/public/img/icon-trezor-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html index 6ff654914..9e55a1f0d 100644 --- a/public/views/includes/walletInfo.html +++ b/public/views/includes/walletInfo.html @@ -1,16 +1,20 @@ -{{index.m}}-of-{{index.n}} - - +{{index.m}}-of-{{index.n}} + + - - -#{{index.account || 0}} + + +#{{index.account || 0}} - + - + - + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 77b5e2037..67c992d5a 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -107,29 +107,8 @@ -
-
- -
-
-
-

- {{(index.alias || index.walletName)}} -

-
- -
-
-
-

- {{(index.alias || index.walletName)}} -

-
- -
-
-
+
+
@@ -137,7 +116,7 @@
-
+
@@ -155,7 +134,7 @@
-
+

Payment Proposals

Unsent transactions

@@ -174,7 +153,7 @@
No transactions yet @@ -198,7 +177,7 @@
-
+

Activity

diff --git a/src/css/main.css b/src/css/main.css index 026d6d1ab..5d9e5ed2e 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -75,7 +75,7 @@ h4.title a { .preferences h4, .modal-content h4, .walletHome h4, .glidera h4 { background: #F6F7F9; - padding: 25px 0px 5px 10px; + padding: 15px 0px 5px 10px; text-transform: uppercase; color: #555; font-size: 12px; @@ -1004,7 +1004,9 @@ a.button.postfix { } .walletHome .icon-wallet { - margin-top: 14px; + display: inline-block; + margin: 0; + vertical-align: baseline; } .icon-input { diff --git a/src/css/mobile.css b/src/css/mobile.css index d670dcde7..ef19ed784 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -192,7 +192,8 @@ _:-ms-fullscreen, :root .main { text-align: center; padding: 1.5rem 1rem 1.5rem 1rem; color: #fff; - height: 175px; + height: 150px; + margin-bottom: 25px; } .alternative-amount { @@ -219,12 +220,6 @@ _:-ms-fullscreen, :root .main { height:100%; } -.avatar-name { - position: relative; - padding-top: 10px; - background-color: #fff; -} - .walletHome .avatar-wallet { padding: 0.5rem; width: 75px; @@ -242,10 +237,12 @@ _:-ms-fullscreen, :root .main { } .walletHome .wallet-info { - margin-left: 85px; - line-height: 110%; - height: 60px; - overflow: hidden; + position: absolute; + top: inherit; + left: 10px; + bottom: 30px; + font-size: 20px; + color: #fff; } .camera-icon a { @@ -258,7 +255,7 @@ _:-ms-fullscreen, :root .main { border-radius: 100%; top: inherit; right: 15px; - bottom: 45px; + bottom: 2px; line-height: 12px; } @@ -807,7 +804,7 @@ textarea:focus transform: translate3d(-100%, 0, 0); width:100%; position: absolute; - top: 45px; + top: 44px; bottom: 37px; overflow: auto; padding-bottom: 40px; From ba5124fe1cb8af879fae3185a71a0491220b3135 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 4 Feb 2016 00:41:05 -0300 Subject: [PATCH 2/2] Fix padding --- src/css/main.css | 8 ++++++-- src/css/mobile.css | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index 5d9e5ed2e..9371aa7f7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -73,9 +73,9 @@ h4.title a { } -.preferences h4, .modal-content h4, .walletHome h4, .glidera h4 { +.preferences h4, .modal-content h4, .glidera h4 { background: #F6F7F9; - padding: 15px 0px 5px 10px; + padding: 25px 0px 5px 10px; text-transform: uppercase; color: #555; font-size: 12px; @@ -83,6 +83,10 @@ h4.title a { margin:0; } +.walletHome h4 { + padding: 15px 0px 5px 10px; +} + .preferences ul, .modal-content ul { font-size:14px; diff --git a/src/css/mobile.css b/src/css/mobile.css index ef19ed784..6c05322b1 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -240,7 +240,7 @@ _:-ms-fullscreen, :root .main { position: absolute; top: inherit; left: 10px; - bottom: 30px; + bottom: 26px; font-size: 20px; color: #fff; }