RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #427 from colkito/bug/qrcode-scanner-css-fix

Browse Source 
fix of CSS for QR code scanner button
This commit is contained in:
Gustavo Maximiliano Cortez 2014-03-10 10:56:01 -02:00
commit 993013c7ee
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
public/src/css/common.css
View File

@ -56,11 +56,19 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
margin: 0 auto 10px auto; margin: 0 auto 10px auto;
display: block; display: block;
} }
#file-input-wrapper { width: 100%; } #file-input-wrapper {
#file-input-wrapper input { opacity: 0; } padding: 0;
#file-input-wrapper span { width: 100%; } width: 100%;
}
#file-input-wrapper input {
opacity: 0;
padding: 5px;
}
#file-input-wrapper span {
padding-top: 5px;
width: 100%;
}
#file-input-wrapper i { display: none; } #file-input-wrapper i { display: none; }
#file-input-wrapper:hover i { display: inline-block; }
/* Wrapper for page content to push down footer */ /* Wrapper for page content to push down footer */
#wrap { #wrap {

8
public/src/js/controllers/scanner.js
View File

@ -55,9 +55,9 @@ angular.module('insight.system').controller('ScannerController',
mpImg.render(canvas, { maxWidth: 200, maxHeight: 200, orientation: 6 }); mpImg.render(canvas, { maxWidth: 200, maxHeight: 200, orientation: 6 });
setTimeout(function() { setTimeout(function() {
//qrcode.width = canvas.width; qrcode.width = canvas.width;
//qrcode.height = canvas.height; qrcode.height = canvas.height;
//qrcode.imagedata = context.getImageData(0, 0, qrcode.width, qrcode.height); qrcode.imagedata = context.getImageData(0, 0, qrcode.width, qrcode.height);
try { try {
//alert(JSON.stringify(qrcode.process(context))); //alert(JSON.stringify(qrcode.process(context)));
@ -65,7 +65,7 @@ angular.module('insight.system').controller('ScannerController',
} catch (e) { } catch (e) {
alert(e); alert(e);
} }
}, 1000); }, 1500);
}; };
})(file); })(file);