From 011e21190342c5ffb0e0f116ca08bef4f3f66871 Mon Sep 17 00:00:00 2001 From: qt31415926 Date: Tue, 31 Mar 2015 00:38:53 -0400 Subject: [PATCH] last ui changes before customization --- background.html | 101 ++++++++++++++++++++++++++---------------------- css/main.css | 18 +++++++++ js/verify.js | 33 ++++++++++------ 3 files changed, 94 insertions(+), 58 deletions(-) diff --git a/background.html b/background.html index 9f65059..0b6fd1a 100644 --- a/background.html +++ b/background.html @@ -12,55 +12,40 @@ -
-
-

MAD: Mindfulness Anti Distraction

+
+

MAD: Mindful Anti Distraction

-
-

Read and type the text below if you REALLY HAVE to go to your site:

-
-
-

-
+ +
+

Do something more rewarding instead!

+
+
+
+ + + +

To-Do List

+
+
+ + + +

Learn

+
+
+ + + +

Language

+
+
+ + + +

Code

+
-
-
- - - Enter Site -
-
-
-

Do something more rewarding instead!

-
-
-
- - - -

Make/Look at your to-do list

-
-
- - - -

Learn new mathematics and sciences

-
-
-
-
- - - -

Speak a new language, forever

-
-
- - - -

Learn how to code in a new language, forever

-
+
+
+

Read and type the text below if you REALLY HAVE to go to your site:

+
+
+

+
+
-
+
+
+
+
+
+ + +
+
+
+ + Enter Site +
+
+
diff --git a/css/main.css b/css/main.css index 84b7b13..861701a 100644 --- a/css/main.css +++ b/css/main.css @@ -13,3 +13,21 @@ blockquote{ -ms-user-select: none; user-select: none; } + +.jumbotron-cust{ + padding: 25px 10px 10px 10px; + color: inherit; + background-color: #eee; +} +.content { + border-bottom: 2px solid #F50042; + line-height: 1.5em; + padding: 10px; +} +.content-a { + padding: 10px; +} + +.form-control.custwidth{ + width: 768px; +} diff --git a/js/verify.js b/js/verify.js index e21275a..486dd4d 100644 --- a/js/verify.js +++ b/js/verify.js @@ -9,20 +9,17 @@ var defSayings = [ "Sites are simply tools, they don't control me", "Resisting this site is easy", "I ain't gonna get tricky tricked by my mindless monotony", - "This site is boo boo", "I am going here not out of habit, but for a solid purpose", - "Imma take a second and think" + "Taking a second and thinkin-a-linkin" ] /* setupUpdater will be called once, on page load. */ var passed = false; window.onload = function setupUpdater(){ - var input=document.getElementsByTagName('textarea')[0] - , count=document.getElementById('percent') - , target=document.getElementById('target') + var input=document.getElementsByTagName('input')[0] + , count=document.getElementById('message') , targetText = defSayings[Math.floor(Math.random()*defSayings.length)] , a = FuzzySet([targetText]) - , orig=document.getElementById('original') , oldText=input , timeout=null; @@ -32,12 +29,12 @@ window.onload = function setupUpdater(){ function handleChange(){ var newText=input.value; var score = a.get(newText)[0][0]; - if (score>0.91) { - // set(count, ""); + if (score>0.88) { + //debug set(count, "You are " + score*100 + "% accurate (need >91)"); passed = true; return; } else if (score> 0.1){ - //debug set(count, "You are " + score*100 + "% accurate (need >91)"); + //debug set(count, "You are " + score*100 + "% accurate (need >91)"); } } @@ -52,13 +49,27 @@ window.onload = function setupUpdater(){ $(function(){ $(".btn-primary").click(function(){ if (passed){ - $("strong").text("You've Unlocked The Button...\nI hope you don't regret this"); + $("#message").text("You've Unlocked The Button...\nI hope you don't regret this"); $(".btn-success").removeAttr("disabled"); console.log(chrome.extension.getBackgroundPage()); $(".btn-success").attr("href", chrome.extension.getBackgroundPage().prevSite); } else - $("strong").text("You failed! (typos are allowed)"); + $("#message").text("You failed! (typos are allowed)"); }); }); +//enter listener +$(function(){ + $('#input-a').keydown(function(e) { + if (e.keyCode == 13){ + if (passed){ + $("#message").text("You've Unlocked The Button...\nI hope you don't regret this"); + $(".btn-success").removeAttr("disabled"); + $(".btn-success").attr("href", chrome.extension.getBackgroundPage().prevSite); + } + else + $("#message").text("You failed! (typos are allowed)"); + } + }); +});