Merge branch 'master' of github.com:alfill/qr-code-scanner

"merge commits"
alfill · Dec 10, 2019 · 8e7ddfe · 8e7ddfe
2 parents 3b454e4 + de2ff1f
commit 8e7ddfe
Show file tree

Hide file tree

Showing 6 changed files with 10,955 additions and 9 deletions.
diff --git a/app/CNAME b/app/CNAME
diff --git a/app/images/touch/apple-touch-icon.jpg b/app/images/touch/apple-touch-icon.jpg
diff --git a/app/index.html b/app/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="ru">
   <head>
     <meta charset="utf-8">
     <title>QR Code Scanner</title>
@@ -14,7 +14,7 @@
     <meta name="msapplication-TileColor" content="#e4e4e4" />
     <meta name="msapplication-TileImage" content="/images/touch/mstile-150x150.png" />
     <meta name="theme-color" content="#fff" />
-    <link rel="apple-touch-icon" href="/images/touch/apple-touch-icon.jpg" />
+    <link rel="apple-touch-icon" href="/images/touch/apple-touch-icon.png" />
     <link rel="icon" type="image/png" href="/images/touch/favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="/images/touch/favicon-16x16.png" sizes="16x16" />
     <link rel="shortcut icon" href="/images/touch/favicon.ico">
@@ -25,7 +25,7 @@
     <div class="app__layout">
       <!-- Header -->
       <header class="app__header">
-        <span class="app__header-icon" onclick="window.open('https://github.com/code-kotis/barcode-scanner', '_blank', 'toolbar=0,location=0,menubar=0');">
+        <span class="app__header-icon" onclick="window.open('#', '_blank', 'toolbar=0,location=0,menubar=0');">
           <svg fill="#FFFFFF" height="27" viewBox="0 0 24 24" width="27" xmlns="http://www.w3.org/2000/svg">
             <path d="M0 0h24v24H0z" fill="none" />
             <path d="M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 9h2V7h-2v2z" />
@@ -62,8 +62,8 @@ <h5>QR Code</h5>
     </div>
 
     <div class="app__select-photos"></div>
-
-    <script>
+<!--
+    <script> 
       if (location.hostname !== "localhost") {
         (function (i, s, o, g, r, a, m) {
           i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
@@ -72,8 +72,8 @@ <h5>QR Code</h5>
             m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
         ga('create', 'pageview');
-      }
-    </script>
+      } 
+    </script> -->
     <script async src="https://cdn.jsdelivr.net/npm/pwacompat@2.0.6/pwacompat.min.js" integrity="sha384-GOaSLecPIMCJksN83HLuYf9FToOiQ2Df0+0ntv7ey8zjUHESXhthwvq9hXAZTifA"
       crossorigin="anonymous"></script>
   </body>

diff --git a/logo.png b/logo.png