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..ad92a45a3 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -18,13 +18,24 @@ display: none; } + .sidebar-bottom { + background: #213140; + padding: 1.2rem; + font-size: 14px; + position: fixed; + bottom: 0; + width: 100%; + text-align: center; + height: 65px; + } + .page, .main { height: auto; } .main { height: 92%; - margin-top: 45px; + margin-top: 30px; margin-left: 0; margin-bottom: -30px; padding: 20px 0 80px 0; @@ -58,7 +69,27 @@ header { height: 45px; + background-color: #213140; + position: fixed; + top: 0; + width: 100%; line-height: 110%; + padding: 0 0.45rem; +/* + padding: 0.45rem; + line-height: 110%; + background-color: #213140; + position: fixed; + width: 100%; + top: 0; +*/ + } + + header .photo-container { + width: 35px; + height: 35px; + margin-right: 10px; + margin-top: 5px; } header h1 { @@ -66,6 +97,22 @@ text-align: center; } + .scroll-section { + position: absolute; + top: 45px; + bottom: 65px; + overflow: scroll; + width: 100%; + } + + .col2 { + width: 180px; + } + + .col2 a.wallet-item { + padding: 0.15rem 0 0.3rem; + } + .col3 a { height: 45px; padding: 12px 5px; @@ -94,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; } @@ -112,10 +161,6 @@ height: 30px; } - .tab-bar-section { - text-align: left; - } - .setup-page { height: 100%; } @@ -125,8 +170,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 { @@ -218,16 +265,18 @@ padding: 0.15rem 0.2rem; } - .side-nav.wallets { - z-index: 100; - overflow-y: inherit; - position: inherit; - height: auto; - border-bottom: none; + .sidebar-mobile-wallets { + background: #E4E8EC; } - .side-nav li.nav-item.selected { - background-color: #3C4E60; + .sidebar-mobile-wallets li { + overflow: hidden; + padding:0.4rem; + border-bottom: 1px solid #DDE2E7; + } + + .sidebar-mobile-wallets li.nav-item.selected { + background-color: #CED5DC; } /* @@ -258,6 +307,39 @@ -webkit-tap-highlight-color:rgba(0,0,0,0); } + 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; + } + + a.button-addwallet i { + background-color: #7A8C9E; + color: #D8DEE3; + border-radius: 100%; + padding: .1rem 0.25rem; + margin-right: 5px; + } + + .add-wallet .button-setup { + border: 1px solid #A5B2BF; + border-radius: 5px; + color: #7A8C9E; + text-align: center; + padding: 2rem; + margin: 2rem 0; + text-transform: uppercase; + font-size: 16px; + } + .modal.fade, .reveal-modal-bg { opacity: 1; } diff --git a/index.html b/index.html index d0b9b38a4..d496904d6 100644 --- a/index.html +++ b/index.html @@ -66,13 +66,14 @@
-
- + +
+
-

- Copay +

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

@@ -81,9 +82,6 @@
-
1) { - elem.addClass('move-left'); - } - } } }; diff --git a/views/add.html b/views/add.html new file mode 100644 index 000000000..aee67848a --- /dev/null +++ b/views/add.html @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 22ec034ce..c73b4e778 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,43 +1,56 @@ -
- - 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 @@ -
-
-

My wallets

-
- -