new PNG qr layout, fixes #46 and #81

darkwallet · May 8, 2014 · 945c534 · 945c534
1 parent 15d1037
commit 945c534
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/css/app.css b/css/app.css
@@ -5011,8 +5011,12 @@ span.contact-name {
   min-height: 100px;
   background-image: none; }
 
-.showqr svg {
-  margin: 1em; }
+.showqr > div {
+  text-align: center; }
+
+.showqr > div img {
+  max-width: 86%;
+  margin-bottom: 1em; }
 
 .qractions {
   position: absolute;
@@ -5038,7 +5042,7 @@ span.contact-name {
 .qr-address {
   word-wrap: break-word;
   color: black;
-  margin: 1em 2em 2em 2em; }
+  margin-right: 3em; }
 
 #logo {
   margin: -2px 5px 0 -5px; }

diff --git a/html/modals/show-qr.html b/html/modals/show-qr.html
@@ -1,6 +1,10 @@
-<div class="text-center showqr">
-	<div qr data="{{vars.address}}" level="L"></div>
-	<div class="qr-address">{{vars.address}}</div>
+<div class="row collapse topmargin">
+	<div class="large-6 medium-7 columns showqr">
+		<div qr data="{{vars.address}}" level="L"></div>
+	</div>
+	<div class="large-6 medium-5 columns">
+		<h5 class="qr-address">{{vars.address}}</h5>
+	</div>
 </div>
 <div class="qractions">
 	<a class="fa fa-times button" ng-click="cancel()"></a>

diff --git a/sass/app.scss b/sass/app.scss
@@ -332,14 +332,16 @@ span.contact-name { font-size: 200%; vertical-align: middle; }
 
 .select-list { min-height: 100px; background-image: none; }
 
-.showqr svg { margin: 1em; }
+.showqr > div { text-align: center; }
+
+.showqr > div img { max-width: 86%; margin-bottom: 1em; }
 
 .qractions { position: absolute; top: 0; right: 0; }
 .qractions a.button { position: absolute; top: 0; right: 0; width: 36px; padding: 8px 0; }
 .qractions a:last-child { top: 40px; }
 
 .modal-show-qr { background: white; top: 10px; overflow: hidden; padding: 0; }
-.qr-address { word-wrap: break-word; color: black; margin: 1em 2em 2em 2em; }
+.qr-address { word-wrap: break-word; color: black; margin-right: 3em; }
 
 #logo { margin: -2px 5px 0 -5px; }