diff --git a/css/src/main.css b/css/src/main.css index 899e7c468..1ee1c3a4d 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -407,6 +407,7 @@ a:hover { .panel.last-transactions { padding: 0; margin-bottom: 2.25rem; + border-radius: 3px 3px 0 3px; } a.missing-copayers { @@ -414,7 +415,7 @@ a.missing-copayers { position: absolute; display: block; right: -1px; - bottom: -23px; + bottom: -18px; padding: 0.2rem 0.5rem; font-size: 10px; border-radius: 0 0 3px 3px; @@ -427,6 +428,8 @@ ul.tx-copayers { background: #E4E8EC; padding: 0.8rem; margin-left: 0; + box-shadow: inset 0 1px 1px 0 rgba(10,19,28,.12); + border-radius: 0 0 3px 3px; } .tx-copayers li { @@ -441,6 +444,9 @@ ul.tx-copayers { background: #2C3E50; padding: 0.6rem; color: #fff; + box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); + -moz-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); + -o-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1); } .last-transactions-content { @@ -449,7 +455,7 @@ ul.tx-copayers { } .last-transactions-footer { - padding: 0.5rem; + padding: 0.8rem; overflow: hidden; } @@ -475,14 +481,19 @@ ul.tx-copayers { color: #fff; } -.tx-copayers .icon-active-check { - background-color: #3FBC9C; +.icon-sign { + padding: 0.2rem 0.3rem; + border-radius: 100%; color: #fff; + margin-right: 7px; } -.last-transactions-content .icon-active-x { +.icon-sign.check { + background-color: #3FBC9C; +} + +.icon-sign.x { background-color: #C0392B; - color: #fff; } .date-message { @@ -1009,8 +1020,8 @@ button[disabled].secondary:focus, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus { - background-color: #95a5a6; - color: #E6E6E6; + background-color: #E4E8EC; + color: #A5B2BF; } /* PRIMARY */ @@ -1385,15 +1396,6 @@ a:hover .photo-container { float: right; } -.icon-status { - background-color: #34495E; - color: #7A8C9E; - border-radius: 100%; - padding: 0.17rem 0.3rem; - float: left; - margin-bottom: 0.2rem; -} - .has-error { color: #C0392A; } diff --git a/css/src/mobile.css b/css/src/mobile.css index 588133526..def7b760d 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -173,6 +173,10 @@ padding: 0.5rem; } + .panel.last-transactions { + margin-bottom: 3.25rem; + } + .addresses .list-addr contact { margin-left: 0; font-size: 14px; @@ -182,11 +186,12 @@ width: auto; padding: 0 5px; } - - table.last-transactions-content .icon-status { - border-radius: 0; - padding: 0.1rem 0.3rem; - margin-bottom: 0; + + a.missing-copayers { + bottom: -34px; + text-align: center; + padding: .7rem; + width: 100%; } .button, button { diff --git a/views/includes/transaction.html b/views/includes/transaction.html index eaa7fc906..95447f1a5 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -38,32 +38,32 @@