From c5cf104e86c109fe9185cb4a28ca32c4de631786 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 17 Dec 2014 19:36:35 -0300 Subject: [PATCH 01/11] removed the wallets sidebar --- index.html | 13 ++--- js/routes.js | 4 ++ views/add.html | 11 ++++ views/includes/sidebar-mobile.html | 87 +++++++++++++++------------- views/includes/walletbar-mobile.html | 32 ---------- 5 files changed, 66 insertions(+), 81 deletions(-) create mode 100644 views/add.html delete mode 100644 views/includes/walletbar-mobile.html diff --git a/index.html b/index.html index e261d9cc9..0c0b518f8 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,6 @@
@@ -65,13 +64,14 @@
-
- + +
+
-

- Copay +

+ {{$root.wallet.getName()}}

@@ -80,9 +80,6 @@
-
+ Create new wallet + + + + Join shared wallet + + + + Import wallet + diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 22ec034ce..0192e2101 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,43 +1,48 @@ -
- -
-
+
+ +
+ +
+

{{$root.iden.getName()}}

+ + {{'View My Profile' | translate }} + + +
+ + + Add wallet + + + {{'Close'|translate}} + {{'Lock'|translate}} + +
+
- diff --git a/views/includes/walletbar-mobile.html b/views/includes/walletbar-mobile.html deleted file mode 100644 index 5dc50cbd0..000000000 --- a/views/includes/walletbar-mobile.html +++ /dev/null @@ -1,32 +0,0 @@ - From 3511cfe9d7479a631d2186bd70deb907ea218f25 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 17 Dec 2014 21:57:44 -0300 Subject: [PATCH 02/11] add style on header & ul --- css/src/main.css | 8 +++++--- css/src/mobile.css | 32 ++++++++++++++++++++++-------- views/includes/sidebar-mobile.html | 23 +++++++++++---------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index faef9ef7f..a14ca9f70 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -219,6 +219,7 @@ header .alt-currency { height:100%; } + .tab-bar { display: none; } @@ -249,11 +250,11 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .side-nav.wallets .avatar-wallet, .wallet-selection.wallets .avatar-wallet { - background-color: #7A8C9E; - color: #213140; + background-color: #1ABC9C; + color: #fff; padding: 0.35rem 0.5rem; text-align: center; - margin-top: 6px; + margin-top: 3px; width: 35px; } @@ -621,6 +622,7 @@ a.button-setup { float: left; color: #fff; text-transform: lowercase; + font-weight: 500; } .name-wallet i { diff --git a/css/src/mobile.css b/css/src/mobile.css index 24458a1ea..a46016e50 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -36,6 +36,7 @@ width: 100%; z-index: 5; background: #3C4E60; + height: 55px; } .bottom-bar { @@ -57,8 +58,17 @@ } header { - height: 45px; + padding: 0.45rem; + height: 55px; line-height: 110%; + background-color: #213140; + } + + header .photo-container { + width: 40px; + height: 40px; + margin-right: 10px; + border: 1px solid #7A8C9E; } header h1 { @@ -112,10 +122,6 @@ height: 30px; } - .tab-bar-section { - text-align: left; - } - .setup-page { height: 100%; } @@ -125,8 +131,10 @@ } .tab-bar h1 { - font-weight: 100; + font-weight: 700; text-align: center; + text-transform: uppercase; + font-size: 14px; } ul.off-canvas-list li a { @@ -173,8 +181,9 @@ background-color: #213140; } - .left-small { + .left-small, .right-small, .tab-bar-section { border-right: none; + padding-top: 0.3rem; } .right-small { @@ -219,6 +228,7 @@ } .side-nav.wallets { + background: #E4E8EC; z-index: 100; overflow-y: inherit; position: inherit; @@ -226,8 +236,14 @@ border-bottom: none; } + .side-nav.wallets li { + margin: 0; + padding: 0.8rem .1rem; + border-bottom: 1px solid #D6DBE1; + } + .side-nav li.nav-item.selected { - background-color: #3C4E60; + background-color: #CED5DC; } /* diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 0192e2101..cfb500e70 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,12 +1,15 @@
- -
- + +
+ +
+
+

{{$root.iden.getName()}}

+ {{'View My Profile' | translate }} +
+
+
-

{{$root.iden.getName()}}

- - {{'View My Profile' | translate }} -
-
\ No newline at end of file +
From 0bc44ad3f5f4c65803ef0cef73e6829725b6c639 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Dec 2014 09:04:58 -0300 Subject: [PATCH 06/11] add style on sidebar left --- views/includes/sidebar-mobile.html | 1 + 1 file changed, 1 insertion(+) diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 9134f77ce..d89844870 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -56,3 +56,4 @@
+ From a769b8318d68b04269ea05828fe5684354a16516 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Dec 2014 16:02:06 -0300 Subject: [PATCH 07/11] add style on add wallet section --- css/src/mobile.css | 11 +++++++++++ views/add.html | 21 ++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index 6ccf3f279..ef65875b4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -315,6 +315,17 @@ margin-right: 5px; } + .add-wallet .button-setup { + border: 1px solid #7A8C9E; + border-radius: 5px; + color: #4B6178; + text-align: center; + padding: 2rem; + margin: 2rem 0; + text-transform: uppercase; + font-size: 16px; + } + .modal.fade, .reveal-modal-bg { opacity: 1; } diff --git a/views/add.html b/views/add.html index b32d4bfb1..aee67848a 100644 --- a/views/add.html +++ b/views/add.html @@ -1,17 +1,16 @@ -
-

Add Wallet

- - Create new wallet - +
+ + + Create new wallet - - Join shared wallet - + + + Join shared wallet - - Import wallet - + + + Import wallet
\ No newline at end of file From 1c56641837ff097860d6042d72299a6452bd98f1 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Dec 2014 16:45:07 -0300 Subject: [PATCH 08/11] fix color --- css/src/mobile.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index ef65875b4..0d1b1a5f4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -316,9 +316,9 @@ } .add-wallet .button-setup { - border: 1px solid #7A8C9E; + border: 1px solid #A5B2BF; border-radius: 5px; - color: #4B6178; + color: #7A8C9E; text-align: center; padding: 2rem; margin: 2rem 0; From f583cee6165ace8bd99883d694e5bf2d527a6fde Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 18 Dec 2014 18:51:01 -0300 Subject: [PATCH 09/11] fix sidebar --- css/src/mobile.css | 65 +++++++++++++----------------- views/includes/sidebar-mobile.html | 35 ++++++++-------- 2 files changed, 45 insertions(+), 55 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index 0d1b1a5f4..bcb4a3dca 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -18,10 +18,15 @@ display: none; } - .sidebar.bottom-bar { + .sidebar-bottom { background: #213140; padding: 1.2rem; font-size: 14px; + position: fixed; + bottom: 0; + width: 100%; + text-align: center; + height: 65px; } .page, .main { @@ -30,7 +35,7 @@ .main { height: 92%; - margin-top: 45px; + margin-top: 30px; margin-left: 0; margin-bottom: -30px; padding: 20px 0 80px 0; @@ -42,7 +47,6 @@ width: 100%; z-index: 5; background: #3C4E60; - height: 55px; } .bottom-bar { @@ -52,15 +56,6 @@ width: 100%; z-index: 5; background: #2C3E50; - height: 65px; - text-align: center; - } - - .bar-lock { - background: #213140; - height: 65px; - width: 100%; - text-align: center; } .home, .settings, .createProfile, .import-profile { @@ -73,20 +68,28 @@ } header { + height: 45px; + background-color: #213140; + position: fixed; + top: 0; + width: 100%; + line-height: 110%; + padding: 0 0.45rem; +/* padding: 0.45rem; - height: 55px; line-height: 110%; background-color: #213140; position: fixed; width: 100%; top: 0; +*/ } header .photo-container { - width: 40px; - height: 40px; + width: 35px; + height: 35px; margin-right: 10px; - border: 1px solid #7A8C9E; + margin-top: 5px; } header h1 { @@ -95,8 +98,11 @@ } .scroll-section { - margin: 55px 0 85px; - + position: absolute; + top: 45px; + bottom: 65px; + overflow: scroll; + width: 100%; } .col3 a { @@ -204,9 +210,8 @@ background-color: #213140; } - .left-small, .right-small, .tab-bar-section { + .left-small { border-right: none; - padding-top: 0.3rem; } .right-small { @@ -250,22 +255,11 @@ padding: 0.15rem 0.2rem; } - .side-nav.wallets { + .sidebar-mobile-wallets { background: #E4E8EC; - z-index: 100; - overflow-y: inherit; - position: inherit; - height: auto; - border-bottom: none; } - .side-nav.wallets li { - margin: 0; - padding: 0.8rem .1rem; - border-bottom: 1px solid #D6DBE1; - } - - .side-nav li.nav-item.selected { + .sidebar-mobile-wallets li.nav-item.selected { background-color: #CED5DC; } @@ -297,17 +291,16 @@ -webkit-tap-highlight-color:rgba(0,0,0,0); } - .button-addwallet { + .button-addwallet a { background: #D8DEE3; border-radius: 4px; color: #7A8C9E; text-transform: uppercase; font-weight: 700; font-size: 12px; - margin: 20px; } - .button-addwallet i { + .button-addwallet a i { background-color: #7A8C9E; color: #D8DEE3; border-radius: 100%; diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index d89844870..017989f89 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,20 +1,17 @@ -
-
- -
- -
-
-

{{$root.iden.getName()}}

- {{'View My Profile' | translate }} -
-
- -
- -
+
+
+ +
+
+
{{$root.iden.getName()}}
+
{{'View My Profile' | translate }}
+
+
+ +
+
-
-
+
{{'Close'|translate}} {{'Lock'|translate}}
-
From 784cd579bd9f51c4f9d5dff842367a487467c5a2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 18 Dec 2014 18:58:35 -0300 Subject: [PATCH 10/11] fix swipe left to hide sidebar --- index.html | 1 + js/services/go.js | 15 ++------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 0c0b518f8..a003a06db 100644 --- a/index.html +++ b/index.html @@ -29,6 +29,7 @@
diff --git a/js/services/go.js b/js/services/go.js index 13fa91ba7..e48a7ba52 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -20,27 +20,16 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope, var elem = angular.element(document.querySelector('#off-canvas-wrap')); var leftbarActive = angular.element(document.getElementsByClassName('move-right')).length; - var rightbarActive = angular.element(document.getElementsByClassName('move-left')).length; if (invert) { - if (rightbarActive) { - hideSidebars(); - } - else { - if ($rootScope.iden && !$rootScope.hideNavigation) { - elem.addClass('move-right'); - } + if ($rootScope.iden && !$rootScope.hideNavigation) { + elem.addClass('move-right'); } } else { if (leftbarActive) { hideSidebars(); } - else { - if ($rootScope.iden && $rootScope.iden.getWallets().length >1) { - elem.addClass('move-left'); - } - } } }; From 57fafbe6a834ef4d82b51bf578c20e039df7961a Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Dec 2014 20:12:40 -0300 Subject: [PATCH 11/11] fix style on sidebar --- css/src/mobile.css | 27 ++++++++++++++++++++++++--- views/includes/sidebar-mobile.html | 4 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index bcb4a3dca..ad92a45a3 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -105,6 +105,14 @@ width: 100%; } + .col2 { + width: 180px; + } + + .col2 a.wallet-item { + padding: 0.15rem 0 0.3rem; + } + .col3 a { height: 45px; padding: 12px 5px; @@ -133,9 +141,11 @@ } .avatar-wallet { + background-color: #1ABC9C; + color: #fff; margin-top: 5px; margin-left: 5px; - margin-right: 5px; + margin-right: 13px; padding: 0.35rem 0.65rem; } @@ -259,6 +269,12 @@ background: #E4E8EC; } + .sidebar-mobile-wallets li { + overflow: hidden; + padding:0.4rem; + border-bottom: 1px solid #DDE2E7; + } + .sidebar-mobile-wallets li.nav-item.selected { background-color: #CED5DC; } @@ -291,16 +307,21 @@ -webkit-tap-highlight-color:rgba(0,0,0,0); } - .button-addwallet a { + a.button-addwallet { background: #D8DEE3; border-radius: 4px; color: #7A8C9E; text-transform: uppercase; font-weight: 700; font-size: 12px; + padding: 0.8rem; + width: 80%; + display: block; + margin: 20px; + text-align: center; } - .button-addwallet a i { + a.button-addwallet i { background-color: #7A8C9E; color: #D8DEE3; border-radius: 100%; diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 017989f89..c73b4e778 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -2,7 +2,7 @@
-
+
{{$root.iden.getName()}}
{{'View My Profile' | translate }}
@@ -39,7 +39,7 @@ - + Add wallet