From ce78aabf38a475f2f4855427b9475eef0fb717ea Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Sun, 16 Oct 2016 18:55:05 -0400 Subject: [PATCH 1/2] moved tab-receive view styling that was conflicting with old wallets selector styles to tab-receive scss file --- src/sass/views/includes/wallets.scss | 4 ---- src/sass/views/tab-receive.scss | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index a58b11b53..4c2d02eaa 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -3,10 +3,6 @@ .swiper-container { width: 85% !important; overflow: visible; - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); @media (max-height: 600px){ &{ transform: translate(-50%, -58%); diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index e2278d337..4343ce06e 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -166,6 +166,31 @@ .wallets{ position: relative; height: calc(100vh - 83vh); + .slides { + .swiper-container{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + } + } + } + @media(min-width: 700px) and (min-height: 700px){ + .wallets{display: none;} + #address{ + height:90vh; + width:75%; + .qr{ + height: 70%; + div{ + transform: scale(1.5); + } + } + #bit-address{ + height: 10%; + padding: calc(100vh - 99vh); + } + } } } From 4920c9766a4c7d389c5aa17e7f254b35e5e4cc97 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Sun, 16 Oct 2016 18:57:09 -0400 Subject: [PATCH 2/2] commented out styles for big screen devices --- src/sass/views/tab-receive.scss | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 4343ce06e..9b940733c 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -175,23 +175,23 @@ } } } - @media(min-width: 700px) and (min-height: 700px){ - .wallets{display: none;} - #address{ - height:90vh; - width:75%; - .qr{ - height: 70%; - div{ - transform: scale(1.5); - } - } - #bit-address{ - height: 10%; - padding: calc(100vh - 99vh); - } - } - } + // @media(min-width: 700px) and (min-height: 700px){ + // .wallets{display: none;} + // #address{ + // height:90vh; + // width:75%; + // .qr{ + // height: 70%; + // div{ + // transform: scale(1.5); + // } + // } + // #bit-address{ + // height: 10%; + // padding: calc(100vh - 99vh); + // } + // } + // } } @keyframes fadeIn {