From 31ff8ea5340cdabc9475a04a27d629b58a5d0868 Mon Sep 17 00:00:00 2001 From: Christopher Pietsch <cpietsch@gmail.com> Date: Tue, 2 Oct 2018 15:04:03 +0200 Subject: [PATCH] cleanup and fixed mobile error --- css/style.css | 19 ++++++++++--------- index.html | 23 ++--------------------- js/utils.js | 6 +++--- js/viz.js | 18 ++---------------- 4 files changed, 17 insertions(+), 49 deletions(-) diff --git a/css/style.css b/css/style.css index be1ce07..c3da117 100644 --- a/css/style.css +++ b/css/style.css @@ -194,21 +194,22 @@ canvas { } .browserInfo { - bottom: -100%; - text-align: center; position: absolute; - z-index: 1000; + z-index: 3000; background: rgb(251, 245, 223); font-weight: bold; - text-transform: uppercase; + font-size: 20px; padding: 20px; - width: 100%; - /* transition: left 0.3s ease-out; */ - box-shadow: 0 0px 56px rgba(0, 0, 0, 0.66), 0 0px 6px rgba(0, 0, 0, 0.23); - transition:bottom 1s; + height: 100%; + vertical-align: middle; + display: none; + text-align: center; +} +.browserInfo span { + font-size: 60px; } .browserInfo.show { - bottom: 0; + display: block; } diff --git a/index.html b/index.html index 80d7d59..bfc447a 100644 --- a/index.html +++ b/index.html @@ -10,34 +10,17 @@ <meta name="format-detection" content="telephone=no" /> <meta name="pinterest" content="nohover" /> <base target="_blank"> -<link rel="apple-touch-icon" sizes="57x57" href="favicon/apple-touch-icon-57x57.png"> -<link rel="apple-touch-icon" sizes="60x60" href="favicon/apple-touch-icon-60x60.png"> -<link rel="apple-touch-icon" sizes="72x72" href="favicon/apple-touch-icon-72x72.png"> -<link rel="apple-touch-icon" sizes="76x76" href="favicon/apple-touch-icon-76x76.png"> -<link rel="apple-touch-icon" sizes="114x114" href="favicon/apple-touch-icon-114x114.png"> -<link rel="apple-touch-icon" sizes="120x120" href="favicon/apple-touch-icon-120x120.png"> -<link rel="icon" type="image/png" href="favicon/favicon-32x32.png" sizes="32x32"> -<link rel="icon" type="image/png" href="favicon/favicon-96x96.png" sizes="96x96"> -<link rel="icon" type="image/png" href="favicon/favicon-16x16.png" sizes="16x16"> -<link rel="manifest" href="favicon/manifest.json"> -<link rel="mask-icon" href="favicon/safari-pinned-tab.svg" color="#5bbad5"> -<meta name="msapplication-TileColor" content="#fffaf9"> -<meta name="theme-color" content="#ffffff"> <link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/infobar.css"> <link rel="stylesheet" href="css/timeline.css"> <link rel="stylesheet" href="css/perfect-scrollbar.css"> -<link rel="author" href="chrispie.com"> -<link rel="publisher" href="chrispie.com"/> - <script src="js/d3.v3.min.js"></script> <script src="js/vue.min.js"></script> <script src="js/marked.min.js"></script> <script src="js/lodash.min.js"></script> <script src="js/pixi.min.js"></script> -<!-- <script src="js/pixi.js"></script> --> <script src="js/pixi-packer-parser.js"></script> <script src="js/loader.js"></script> <script src="js/canvas.js"></script> @@ -45,7 +28,6 @@ <script src="js/search.js"></script> <script src="js/tags.js"></script> <script src="js/utils.js"></script> -<script src="js/perfect-scrollbar.js"></script> <script src="js/modernizr-custom.js"></script> <!--[if lt IE 9]> <script src='http://html5shiv.googlecode.com/svn/trunk/html5.js' type='text/javascript'></script> @@ -86,16 +68,15 @@ christopher pietsch cpietsch@gmail.com -@chrispiecom 2015-2018 --> </head> <body> <div id="hiddenreload"></div> -<!-- <div class="overlay"></div> --> + <div class="browserInfo"> -This visualization is not optimized for mobiles. Please come back on a Computer. +<p>This visualization is not optimized for mobile phones and needs WebGL enabled.</p><p>Please come back on a Computer.</p><span>💡</span> </div> <div class="search"></div> diff --git a/js/utils.js b/js/utils.js index 2ee79a3..5c2ad3d 100644 --- a/js/utils.js +++ b/js/utils.js @@ -7,9 +7,9 @@ window.utils = {}; utils.isMobile = function(){ - var check = false; - (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true})(navigator.userAgent||navigator.vendor||window.opera); - return check; + return (window.innerWidth + || document.documentElement.clientWidth + || document.body.clientWidth) < 500; } utils.isSafari = function(){ diff --git a/js/viz.js b/js/viz.js index 36bd7e9..0db8aaf 100644 --- a/js/viz.js +++ b/js/viz.js @@ -41,10 +41,8 @@ var canvas; var search; var ping; -if (Modernizr.webgl) { +if (Modernizr.webgl && !utils.isMobile()) { init(); -} else { - alert("Sorry your device doesn't support webGL") } @@ -117,16 +115,4 @@ d3.select(".infobutton") }) -var browserInfo = d3.select(".browserInfo"); - -if(utils.isMobile()){ - browserInfo - .text("This visualization is not optimized for mobiles. Please come back on a Computer.") - .on("click", function(){ browserInfo.remove(); }) - .transition() - .delay(7000) - .each("end", function(){ - d3.select(this).classed("show", false).remove(); - }) - -} \ No newline at end of file +d3.select(".browserInfo").classed("show", utils.isMobile()); -- GitLab