From d0604331bd6650f29c4b60bfb1caa5d95ca99ff2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 10:36:01 -0300 Subject: [PATCH 1/3] Styling for tabs on create new wallet --- public/views/create.html | 12 +++++------- src/css/mobile.css | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index a62aadcdc..9c7ed15bf 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -21,15 +21,13 @@ -
+
Personal + ng-class="{'selected': totalCopayers == 1}" + ng-click="create.setTotalCopayers(1)" translate>Personal Wallet Multisignature + ng-class="{'selected': totalCopayers != 1}" + ng-click="create.setTotalCopayers(3)" translate>Shared Wallet
diff --git a/src/css/mobile.css b/src/css/mobile.css index 32e8daa36..40d2297d6 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -726,6 +726,34 @@ textarea:focus transform: translate3d(-100%, 0, 0) !important; } +.create-tab { + width: 100%; + border-bottom: 1px solid #DEDFE1; + margin-bottom: 25px; + padding: 0 0 .58rem; +} + +.create-tab a { + margin-left: 1.075rem; + margin-right: 1.575rem; + font-size: .7rem; + padding: 0 0 .6rem; + color: #929396; + text-transform: uppercase; +} + +.create-tab a:hover, +.create-tab a:focus { + color: #206ae3; +} + +.create-tab a.selected, +.create-tab a:active { + font-weight: 600; + color: #4683E8; + border-bottom: 3px solid #4683E8; +} + /* removes 300ms in IE */ -ms-touch-action: manipulation; /* IE10 / touch-action: manipulation; /* IE11+ */ From 2b655ed6c1f69c80a07d84e924b14913e754b818 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 10:48:52 -0300 Subject: [PATCH 2/3] Normalize colors --- src/css/mobile.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 40d2297d6..f686dc8e5 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -729,8 +729,8 @@ textarea:focus .create-tab { width: 100%; border-bottom: 1px solid #DEDFE1; - margin-bottom: 25px; - padding: 0 0 .58rem; + margin-bottom: 20px; + padding: 0 0 .5rem; } .create-tab a { @@ -744,14 +744,14 @@ textarea:focus .create-tab a:hover, .create-tab a:focus { - color: #206ae3; + color: #2C3E50; } .create-tab a.selected, .create-tab a:active { font-weight: 600; - color: #4683E8; - border-bottom: 3px solid #4683E8; + color: #2C3E50; + border-bottom: 3px solid #2C3E50; } /* removes 300ms in IE */ From 9f6426388b7dc0097ef232737a72e64ac7a7d188 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 11:10:03 -0300 Subject: [PATCH 3/3] Fix to wide screen --- public/views/create.html | 4 ++++ src/css/mobile.css | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index 9c7ed15bf..e6333144a 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -22,12 +22,16 @@
+ +
diff --git a/src/css/mobile.css b/src/css/mobile.css index f686dc8e5..63063bb38 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -729,13 +729,17 @@ textarea:focus .create-tab { width: 100%; border-bottom: 1px solid #DEDFE1; - margin-bottom: 20px; - padding: 0 0 .5rem; + margin-bottom: 25px; + padding: 0 0 .5rem 1rem; + overflow: hidden; +} + +.create-tab .tab-container { + float: left; + width: 50%; } .create-tab a { - margin-left: 1.075rem; - margin-right: 1.575rem; font-size: .7rem; padding: 0 0 .6rem; color: #929396;