From 8ab32eb684568d6097357e9d41fd21bbafc44b42 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 29 Oct 2014 11:57:43 -0300 Subject: [PATCH 1/2] fix ui details --- css/src/main.css | 17 +++++++++++------ css/src/mobile.css | 3 ++- views/addresses.html | 6 +++--- views/modals/address-book.html | 6 +++--- views/send.html | 5 +++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 9df1e9080..e527122be 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -246,7 +246,8 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .side-nav.wallets .avatar-wallet{ background-color: #7A8C9E; color: #213140; - padding: 0.35rem 0.7rem; + padding: 0.35rem 0.5rem; + text-align: center; margin-top: 6px; width: 35px; } @@ -257,11 +258,12 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu margin-top: 10px; margin-left: 10px; margin-right: 8px; - padding: 0.5rem 0.8rem; + padding: 0.5rem 0.65rem; background-color: #fff; color: #1ABC9C; border-radius: 3px; line-height: 24px; + text-align: center; } .status { @@ -329,13 +331,13 @@ a:hover { .main { margin-left: 250px; - padding: 80px 1.5rem; + padding: 100px 2.5rem; background-color: #F8F8FB; } .logo-setup { text-align: center; - padding: 2rem 0; + padding: 7rem 0 5rem; color: #fff; } @@ -950,6 +952,9 @@ button.warning, .button.warning { background-color: #C0392A; color: #fff; + border-radius: 2px; + -moz-box-shadow: 1px 1px 0px 0px #A02F23; + box-shadow: 1px 1px 0px 0px #A02F23; } button.warning:hover, button.warning:focus, @@ -1091,11 +1096,10 @@ button.gray:focus, .side-nav li.nav-item:hover { background-color: #3C4E60; overflow: hidden; - border-radius: 3px; } -.side-nav {padding: 0;} +.side-nav {padding-top: 38px;} .side-nav li { font-size: 16px; @@ -1111,6 +1115,7 @@ button.gray:focus, .side-nav li>a:first-child:not(.button), .side-nav li a:not(.button) { color: #fff; + padding-left: 40px; } .side-nav li>a:first-child:not(.button) i { diff --git a/css/src/mobile.css b/css/src/mobile.css index a51ae68c0..68765adde 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -19,6 +19,7 @@ .logo-setup { margin: 20px 0; + padding: 2rem 0; } .home, .open, .join, .waiting-copayers, .setup, .import, .settings { @@ -39,7 +40,7 @@ margin-left: 0; margin-bottom: -40px; padding-bottom: 60px; - padding-top: 20px; + padding: 20px 1.2rem; } .tab-bar { diff --git a/views/addresses.html b/views/addresses.html index d220142bd..0883d8df8 100644 --- a/views/addresses.html +++ b/views/addresses.html @@ -49,13 +49,13 @@ - + Show all Show less -
- Add +
diff --git a/views/modals/address-book.html b/views/modals/address-book.html index 022b0be89..06dafe4d1 100644 --- a/views/modals/address-book.html +++ b/views/modals/address-book.html @@ -1,5 +1,5 @@

Address Book

-
+ - Cancel - Cancel +
diff --git a/views/send.html b/views/send.html index 38a542149..69236e72a 100644 --- a/views/send.html +++ b/views/send.html @@ -184,7 +184,8 @@ -
+
+

Address Book

Empty. Create an alias for your addresses

@@ -210,7 +211,7 @@
- +
From 74ad1f37ff2391c5c72d8ea385e74b6c4ce2e702 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 29 Oct 2014 15:22:24 -0300 Subject: [PATCH 2/2] perfil photo container --- css/src/main.css | 18 +++++++++++++++++- views/includes/head.html | 6 +++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index e527122be..fd1a09464 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -159,7 +159,7 @@ header .alt-currency { display: block; height: 62px; width: 140px; - padding: 22px 5px; + padding: 12px 5px; text-align: center; } @@ -1098,6 +1098,22 @@ button.gray:focus, overflow: hidden; } +.photo-container { + margin-right: 10px; + padding-top: 0.4rem; + display: inline-block; + width: 35px; + height: 35px; + color: #fff; + background: #7A8C9E; + border-radius: 100%; + vertical-align: middle; +} + +a:hover .photo-container { + background: #34495E; + color: #fff; +} .side-nav {padding-top: 38px;} diff --git a/views/includes/head.html b/views/includes/head.html index 9716688a2..41c0cad7b 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -4,7 +4,11 @@