From b670db61ee1f6a1f0b426c90690146510fbc4b95 Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Mon, 25 Nov 2019 14:06:56 -0800 Subject: [PATCH 1/6] Split Open Browser button into two buttons for Solo and Production sites. This is intended to be temporary until current Production is transitioned out. --- index.css | 6 +++++- index.html | 16 +++++++++++----- index.js | 6 +++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/index.css b/index.css index 9a55c22..d089324 100644 --- a/index.css +++ b/index.css @@ -108,12 +108,16 @@ body { .button-label { position: absolute; text-align: center; - left: 325px; + left: 323px; width: 160px; font-family: Baloo Bhaina; font-size: 20px; } +.button-label-small { + font-size: 14px; +} + .button { width: 150px; border: none; diff --git a/index.html b/index.html index d0f7b48..73af81b 100644 --- a/index.html +++ b/index.html @@ -69,18 +69,24 @@
- Click: + Open Browser:
- +
-
+
+ --or-- +
+
+ +
+
Status:
-
+
✔ Connected - Waiting to
connect...To connect:
Open browser to BlocklyProp
site, then navigate to
View/Edit project code
+ Waiting to
connect...To connect:
Open browser to desired
site, then navigate to
View/Edit project code
v0.0.0
From 2cfb5d22679570b5235a7304f1aaccb5046b2d5e Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Mon, 25 Nov 2019 16:11:35 -0800 Subject: [PATCH 3/6] Refactored statustiptext to be tooltip and fixed tip pointer to be same tip background color. --- index.css | 20 ++++++++++---------- index.html | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/index.css b/index.css index 9175fc1..9976b87 100644 --- a/index.css +++ b/index.css @@ -153,10 +153,10 @@ body { background-color: #335b9c; } -.button .statustiptext { +.button .tooltip { visibility: hidden; width: 130px; - background-color: #339037; + background-color: #117022; color: #fff; text-align: center; border-radius: 6px; @@ -174,7 +174,7 @@ body { transition: opacity 0.4s; } -.button .statustiptext::after { +.button .tooltip::after { content: ""; position: absolute; top: 50%; @@ -182,10 +182,10 @@ body { margin-top: -5px; border-width: 5px; border-style: solid; - border-color: transparent transparent transparent #4472c4; + border-color: transparent transparent transparent #117022; } -.button:hover .statustiptext { +.button:hover .tooltip { visibility: visible; opacity: 1.0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); @@ -246,10 +246,10 @@ body { border: none; } -.status-clear .statustiptext { +.status-clear .tooltip { visibility: hidden; width: 200px; - background-color: #339037; + background-color: #117022; color: #fff; text-align: center; border-radius: 6px; @@ -267,7 +267,7 @@ body { transition: opacity 0.4s; } -.status-clear .statustiptext::after { +.status-clear .tooltip::after { content: ""; position: absolute; top: 50%; @@ -275,10 +275,10 @@ body { margin-top: -5px; border-width: 5px; border-style: solid; - border-color: transparent transparent transparent #4472c4; + border-color: transparent transparent transparent #117022; } -.status-clear:hover .statustiptext { +.status-clear:hover .tooltip { visibility: visible; opacity: 1.0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); diff --git a/index.html b/index.html index 1c2c496..0ce371c 100644 --- a/index.html +++ b/index.html @@ -72,13 +72,13 @@ Open Browser:
- +
--or--
- +
Status: @@ -86,7 +86,7 @@
✔ Connected - Waiting to
connect...To connect:
Open browser to desired
site, then navigate to
View/Edit project code
+ Waiting to
connect...To connect:
Open browser to desired
site, then navigate to
View/Edit project code
From 00f8a358c2d63bfaa29892e3b7a3652fc3b7446d Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Mon, 25 Nov 2019 16:36:51 -0800 Subject: [PATCH 4/6] Simplified CSS for tooltip instances. --- index.css | 60 ++++++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/index.css b/index.css index 9976b87..bdcabf3 100644 --- a/index.css +++ b/index.css @@ -154,35 +154,9 @@ body { } .button .tooltip { - visibility: hidden; width: 130px; - background-color: #117022; - color: #fff; - text-align: center; - border-radius: 6px; - padding-top: 3px; - padding-bottom: 5px; - /* Position the tip (left of button)*/ - position: absolute; - z-index: 1; top: 12px; - right: 106%; - - /* Fade in tip - takes 4/10 second to go from 0% to 100% opacity */ - opacity: 0.0; - transition: opacity 0.4s; -} - -.button .tooltip::after { - content: ""; - position: absolute; - top: 50%; - left: 100%; - margin-top: -5px; - border-width: 5px; - border-style: solid; - border-color: transparent transparent transparent #117022; } .button:hover .tooltip { @@ -232,11 +206,23 @@ body { .status-clear { height: 38px; width: 114px; - background: none; /* Green */ + background: none; color: #ccc; border:2px solid #ddd; } +.status-clear .tooltip { + width: 200px; + /* Position the tip (left of status)*/ + top: -7px; +} + +.status-clear:hover .tooltip { + visibility: visible; + opacity: 1.0; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + .status-green { height: 31px; width: 118px; @@ -246,9 +232,13 @@ body { border: none; } -.status-clear .tooltip { +/*----------*/ +/* Tool Tip */ +/*----------*/ + +.tooltip { visibility: hidden; - width: 200px; + width: 100px; /* Default size */ background-color: #117022; color: #fff; text-align: center; @@ -256,10 +246,10 @@ body { padding-top: 3px; padding-bottom: 5px; - /* Position the tip (left of status)*/ + /* Position the tip (left of button)*/ position: absolute; z-index: 1; - top: -7px; + top: 10px; /* Default position */ right: 106%; /* Fade in tip - takes 4/10 second to go from 0% to 100% opacity */ @@ -267,7 +257,7 @@ body { transition: opacity 0.4s; } -.status-clear .tooltip::after { +.tooltip::after { content: ""; position: absolute; top: 50%; @@ -278,12 +268,6 @@ body { border-color: transparent transparent transparent #117022; } -.status-clear:hover .tooltip { - visibility: visible; - opacity: 1.0; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); -} - /*-------------*/ /* App version */ /*-------------*/ From 882a8829f9efeca450933b413c2f50ea2c8edf95 Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Tue, 26 Nov 2019 11:35:47 -0800 Subject: [PATCH 5/6] Simplified further, applied generic font (as a backup), and fixed typo. --- index.css | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/index.css b/index.css index bdcabf3..b99ff3c 100644 --- a/index.css +++ b/index.css @@ -109,16 +109,16 @@ body { outline: none; } -/*---------------*/ -/* Browse Buttons*/ -/*---------------*/ +/*----------------*/ +/* Browse Buttons */ +/*--------------- */ .button-label { position: absolute; text-align: center; left: 323px; width: 160px; - font-family: Baloo Bhaina; + font-family: Baloo Bhaina, sans-serif; font-size: 20px; } @@ -155,16 +155,10 @@ body { .button .tooltip { width: 130px; - /* Position the tip (left of button)*/ + /* Vertically position the tip in relation to the button*/ top: 12px; } -.button:hover .tooltip { - visibility: visible; - opacity: 1.0; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); -} - /*-----------------*/ /* Settings button */ /*-----------------*/ @@ -213,16 +207,10 @@ body { .status-clear .tooltip { width: 200px; - /* Position the tip (left of status)*/ + /* Vertically position the tip in relation to the button*/ top: -7px; } -.status-clear:hover .tooltip { - visibility: visible; - opacity: 1.0; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); -} - .status-green { height: 31px; width: 118px; @@ -268,6 +256,12 @@ body { border-color: transparent transparent transparent #117022; } +*:hover > .tooltip { + visibility: visible; + opacity: 1.0; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + /*-------------*/ /* App version */ /*-------------*/ From d570fc0eaed3daf440e91de30a0fb029cf5bb8ac Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Tue, 26 Nov 2019 12:02:42 -0800 Subject: [PATCH 6/6] Updated Solo link to HTTPS:// --- index.js | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index ae6a5bf..9218040 100644 --- a/index.js +++ b/index.js @@ -153,7 +153,7 @@ document.addEventListener('DOMContentLoaded', function() { } $('open-blocklypropsolo').onclick = function() { - chrome.browser.openTab({ url: "http://solo.parallax.com/"}); + chrome.browser.openTab({ url: "https://solo.parallax.com/"}); }; $('open-blocklyprop').onclick = function() { diff --git a/manifest.json b/manifest.json index 29b2d9f..d8c9045 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "BlocklyProp Launcher", "description": "A Chrome application that connects your Propeller-Powered Hardware to the BlocklyProp website.", - "version": "0.10.0", + "version": "0.11.0", "manifest_version": 2, "minimum_chrome_version": "45",