From 8765ac5ca5db94b78bbe6a571f3d29d153aaf42c Mon Sep 17 00:00:00 2001 From: Mariano Rodriguez Date: Tue, 11 Nov 2014 13:29:26 -0300 Subject: [PATCH 1/4] new logo version --- img/logo-negative-beta.svg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/img/logo-negative-beta.svg b/img/logo-negative-beta.svg index e54eb3d0a..156b7a3cd 100644 --- a/img/logo-negative-beta.svg +++ b/img/logo-negative-beta.svg @@ -1,19 +1,19 @@ - - - Copay + Path 1 + Path 1 copy + beta - Created with Sketch. + + + Imported Layers + Created with Sketch. - - - - - - - - - - + + + + + + + + + + \ No newline at end of file From 2dc4cb26e1ec7cb83d55985ae16aa209623aa6b3 Mon Sep 17 00:00:00 2001 From: Mariano Rodriguez Date: Thu, 13 Nov 2014 12:36:30 -0300 Subject: [PATCH 2/4] table style --- css/src/main.css | 14 ++++++++ views/profile.html | 85 ++++++++++++++++++++++++---------------------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index b984e347b..9356e8474 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -836,6 +836,20 @@ label small.has-error { font-size: 11px; } +table { border-collapse: collapse; text-align: left; width: 100%; border: none; + box-shadow: -2px 1px 9px 1px #DDDDDD; +-webkit-box-shadow: -2px 1px 5px 1px #DDDDDD; +-moz-box-shadow: -2px 1px 5px 1px #DDDDDD; +-o-box-shadow: -2px 1px 5px 1px #DDDDDD; + +} +thead tr{ text-transform: uppercase; border-top: 1px solid #FFFFFF; height: 46px} +table td, .datagrid table th { padding: 15px 15px; height: 58px} } +table thead th {background-color: #F5F5F8; color:#949BAD; font-size: 13px; font-weight: normal; !important} +table tbody td { color: #000000; font-size: 14px;border-bottom: 1px solid #F1F1F3; } +table tbody tr:last-child td { border-bottom: none; } + + table tr.active { background: #CBECE6; } diff --git a/views/profile.html b/views/profile.html index 248ce524d..f51adcde0 100644 --- a/views/profile.html +++ b/views/profile.html @@ -42,48 +42,51 @@

Manage wallets

- - - - - - - - - - - - - - - - - - - -
NameTypeStatusBalanceActions
{{item.name || item.id }}{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}{{isReady ? 'Complete' : 'Waiting for copayers...'}} - - - - {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} - - -
- - -     - -
- -
+
+ + + + + + + + + + + + + + + + + + + +
NameTypeStatusBalanceActions
{{item.name || item.id }}{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}{{isReady ? 'Complete' : 'Waiting for copayers...'}} + - + + {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} + + + +
+ + +     + +
+ +
+
From fb33210c9420d6b0f396e455dfe11339b113a1b1 Mon Sep 17 00:00:00 2001 From: Mariano Rodriguez Date: Fri, 14 Nov 2014 13:08:18 -0300 Subject: [PATCH 3/4] table modification of class --- css/src/main.css | 2 +- views/profile.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 9356e8474..9014665cd 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -844,7 +844,7 @@ table { border-collapse: collapse; text-align: left; width: 100%; border: none; } thead tr{ text-transform: uppercase; border-top: 1px solid #FFFFFF; height: 46px} -table td, .datagrid table th { padding: 15px 15px; height: 58px} } +table td, table th { padding: 15px 15px; height: 58px} } table thead th {background-color: #F5F5F8; color:#949BAD; font-size: 13px; font-weight: normal; !important} table tbody td { color: #000000; font-size: 14px;border-bottom: 1px solid #F1F1F3; } table tbody tr:last-child td { border-bottom: none; } diff --git a/views/profile.html b/views/profile.html index f51adcde0..54689fbf0 100644 --- a/views/profile.html +++ b/views/profile.html @@ -43,7 +43,7 @@

Manage wallets

-
+
From ce55c0b562491b577f1caa521e22546562e87a30 Mon Sep 17 00:00:00 2001 From: Mariano Rodriguez Date: Fri, 14 Nov 2014 14:00:23 -0300 Subject: [PATCH 4/4] div and px deleted --- views/profile.html | 56 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/views/profile.html b/views/profile.html index 54689fbf0..d398d1de0 100644 --- a/views/profile.html +++ b/views/profile.html @@ -43,50 +43,50 @@

Manage wallets

-
-
- - - - - - - - - - - + + + + + + + + + + + - - - - + + + - +
NameTypeStatusBalanceActions
NameTypeStatusBalanceActions
{{item.name || item.id }}{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}{{isReady ? 'Complete' : 'Waiting for copayers...'}} - - - + {{item.name || item.id }}{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}{{isReady ? 'Complete' : 'Waiting for copayers...'}} + - + {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} - - + + -
- + -     - -
+
-
+