Merge branch 'master' into gh-pages

qistoph · Apr 25, 2013 · 0c5036e · 0c5036e
2 parents d43988c + e3fcd41
commit 0c5036e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -112,7 +112,7 @@
 				background: #ffffff;
 				display: table;
 				margin: 0 auto 1.4em;
-				padding: 0.8em;
+				padding: 0.8em 0.8em 0.2em;
 			}
 
 			#qrcode {
@@ -122,7 +122,7 @@
 			}
 
 			#qrsub {
-				margin: 0 auto;
+				margin: 0.2em auto 0;
 				font-family: Courier New;
 				display: table;
 			}
@@ -220,7 +220,7 @@
 					";";
 
 				divCanvas.empty().qrcode(url);
-				divText.text("WiFi: " + $("#S").val() + " (" + type + ")");
+				divText.html('<img src="wifi2.png" style="vertical-align:text-top;"> ' + $("#S").val() + ' (' + type + ')');
 			}
 
 			function printQR() {
@@ -230,7 +230,7 @@
 				printWin.document.write('<div id="qrcode"></div>');
 				printWin.document.write('<div id="qrsub"></div>');
 				printWin.document.write('</div>');
-				printWin.document.write('WiFi QR-code generator - http://www.bladibla.com');
+				printWin.document.write('WiFi QR-code generator - http://qistoph.github.io/WiFiQR/');
 				printWin.document.write('</body></html>');
 
 				$("link, style, script").each(function() {