Fix Conflicts:

css/main.css
	views/modals/qr-address.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 13:14:10 -03:00
commit a3baab397c
9 changed files with 46 additions and 29 deletions

View file

@ -1116,5 +1116,11 @@ a.text-white:hover {color: #ccc;}
.btn-copy.zeroclipboard-is-hover { color: #000; }
.btn-copy.zeroclipboard-is-active { opacity: 1; }
@media only screen and (min-width: 40.063em) {
dialog.tiny, .reveal-modal.tiny {
width: 50%;
margin-left: -25%;
}
}
/*-----------------------------------------------------------------*/

View file

@ -114,6 +114,13 @@
display: block;
float: none;
margin: 0 auto;
width: 210px;
height: 210px;
}
.panel qrcode canvas {
width: 200px;
height: 200px;
}
.btn-copy {