From b82e68d05c44917dec80918f841b273891689522 Mon Sep 17 00:00:00 2001 From: Is Isilon Date: Mon, 22 Feb 2016 16:08:27 +0800 Subject: [PATCH] Replaced detector with test tube --- css/style.css | 29 +++- index.html | 29 +++- js/analytics.js | 15 +- js/app.js | 6 + js/detector.js | 322 ------------------------------------- js/detector/bubblr.js | 161 +++++++++++++++++++ js/detector/detector.js | 148 +++++++++++++++++ js/{ => detector}/event.js | 9 +- js/detector/flame.js | 109 +++++++++++++ js/game.js | 7 +- js/gameobjects.js | 6 +- js/histogram.js | 137 ---------------- js/ui.js | 46 +++--- json/keywords.json | 1 + json/runes.json | 83 ++++++++++ 15 files changed, 607 insertions(+), 501 deletions(-) delete mode 100644 js/detector.js create mode 100644 js/detector/bubblr.js create mode 100644 js/detector/detector.js rename js/{ => detector}/event.js (87%) create mode 100644 js/detector/flame.js delete mode 100644 js/histogram.js create mode 100644 json/keywords.json create mode 100644 json/runes.json diff --git a/css/style.css b/css/style.css index 9a09b16..3fe4619 100644 --- a/css/style.css +++ b/css/style.css @@ -203,7 +203,7 @@ h1 br { } @media screen and (orientation:landscape) and (max-width: 767px) { - + } @media screen and (min-width: 768px) { @@ -295,3 +295,30 @@ h1 br { background-image: url('../assets/pc32@2x.png'); } } + + +/* bubblr http://likeadev.com/show/how-to-make-a-cool-laboratory-tube-with-animated-bubbles.html */ +.test-tube-container { + padding-top: 50px; +} +.test-tube { + /*width: 100%;*/ + height: 425px; + border-left: 5px solid #949494; + border-right: 5px solid #949494; + border-bottom: 5px solid #949494; + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; +} +.test-tube .test-tube-bg { + background: #e8e8e8; + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + height: 400px; + top: 20px; + position: relative; +} +.test-tube .substance { + top: -20px; + position: relative +} diff --git a/index.html b/index.html index 00fd915..79591d8 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - +