From 832e16ef8644bcc9b29735f52eb318040a00480d Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 27 Apr 2017 11:18:23 -0700
Subject: [PATCH] Visual tweaks; fix active share buttons; comment out tests
---
scripts/system/html/css/SnapshotReview.css | 13 ++++++++-----
scripts/system/html/css/hifi-style.css | 2 ++
scripts/system/html/js/SnapshotReview.js | 14 +++++++++-----
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/scripts/system/html/css/SnapshotReview.css b/scripts/system/html/css/SnapshotReview.css
index d86befc30a..12b91d372b 100644
--- a/scripts/system/html/css/SnapshotReview.css
+++ b/scripts/system/html/css/SnapshotReview.css
@@ -60,6 +60,8 @@ input[type=button].naked:active {
.snapshotInstructions {
font-family: Raleway-Regular;
margin: 0 20px;
+ width: 100%;
+ height: 50%;
}
/*
// END styling of snapshot instructions panel
@@ -119,6 +121,7 @@ input[type=button].naked:active {
align-items: center;
margin-left: 30px;
height: 100%;
+ width: 80%;
}
.blastToConnections {
text-align: left;
@@ -158,6 +161,7 @@ input[type=button].naked:active {
text-shadow: 2px 2px 3px #000000;
height: 100%;
margin-right: 10px;
+ width: 20%;
}
.showShareButton {
width: 40px;
@@ -217,7 +221,6 @@ input[type=button].naked:active {
width: 100%;
position: absolute;
left: 0;
- margin-top: 8px;
overflow: hidden;
display: flex;
justify-content: center;
@@ -225,20 +228,20 @@ input[type=button].naked:active {
#snap-settings {
display: inline;
width: 150px;
- margin: auto;
+ margin: 2px auto 0 auto;
}
#snap-settings form input {
margin-bottom: 5px;
}
#snap-button {
- width: 75px;
- height: 75px;
+ width: 72px;
+ height: 72px;
padding: 0;
border-radius: 50%;
background: #EA4C5F;
border: 3px solid white;
- margin: auto;
+ margin: 2px auto 0 auto;
box-sizing: content-box;
display: inline;
outline:none;
diff --git a/scripts/system/html/css/hifi-style.css b/scripts/system/html/css/hifi-style.css
index 6e8dd7c710..37810707e0 100644
--- a/scripts/system/html/css/hifi-style.css
+++ b/scripts/system/html/css/hifi-style.css
@@ -156,6 +156,8 @@ input[type=radio]:active + label > span > span{
border-radius: 3px;
border-width: 0px;
background-image: linear-gradient(#00B4EF, #1080B8);
+ min-height: 30px;
+
}
.blueButton:hover {
background-image: linear-gradient(#00B4EF, #00B4EF);
diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js
index 8a204840ac..f5aaa59d90 100644
--- a/scripts/system/html/js/SnapshotReview.js
+++ b/scripts/system/html/js/SnapshotReview.js
@@ -22,7 +22,9 @@ function showSetupInstructions() {
"<h4>Setup Instructions</h4>" +
"<p>Before you can begin taking snaps, please choose where you'd like to save snaps on your computer:</p>" +
'<br/>' +
- '<input type="button" value="CHOOSE" onclick="chooseSnapshotLocation()" />';
+ '<div style="text-align:center;">' +
+ '<input class="blueButton" style="margin-left:auto;margin-right:auto;width:130px;" type="button" value="CHOOSE" onclick="chooseSnapshotLocation()" />' +
+ '</div>';
document.getElementById("snap-button").disabled = true;
}
function showSetupComplete() {
@@ -106,7 +108,7 @@ function createShareBar(parentID, isGif, shareURL, hifiShareButtonsDisabled) {
var facebookButtonID = parentID + "facebookButton";
var twitterButtonID = parentID + "twitterButton";
shareBar.innerHTML += '' +
- '<div class="shareButtons" id="' + shareButtonsDivID + '" style="opacity:0">' +
+ '<div class="shareButtons" id="' + shareButtonsDivID + '" style="visibility:hidden">' +
'<input type="button"' + (hifiShareButtonsDisabled ? ' disabled="disabled"' : '') + ' class="blastToConnections blueButton" id="' + blastToConnectionsButtonID + '" value="BLAST TO MY CONNECTIONS" onclick="blastToConnections(' + parentID + ', ' + isGif + ')" />' +
'<input type="button"' + (hifiShareButtonsDisabled ? ' disabled="disabled"' : '') + ' class="shareWithEveryone" id="' + shareWithEveryoneButtonID + '" onclick="shareWithEveryone(' + parentID + ', ' + isGif + ')" />' +
'<a class="facebookButton" id="' + facebookButtonID + '" onClick="shareButtonClicked(' + parentID + ')" target="_blank" href="https://www.facebook.com/dialog/feed?app_id=1585088821786423&link=' + shareURL + '"></a>' +
@@ -141,7 +143,7 @@ function selectImageToShare(selectedID, isSelected) {
shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.5)";
- shareButtonsDiv.style.opacity = "1.0";
+ shareButtonsDiv.style.visibility = "visible";
} else {
showShareButtonsButton.onclick = function () { selectImageToShare(selectedID, true) };
showShareButtonsButton.classList.remove("active");
@@ -151,7 +153,7 @@ function selectImageToShare(selectedID, isSelected) {
shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.0)";
- shareButtonsDiv.style.opacity = "0.0";
+ shareButtonsDiv.style.visibility = "hidden";
}
}
function shareForUrl(selectedID) {
@@ -223,7 +225,9 @@ function handleCaptureSetting(setting) {
}
window.onload = function () {
- testInBrowser(false);
+ // Uncomment the line below to test functionality in a browser.
+ // See definition of "testInBrowser()" to modify tests.
+ //testInBrowser(true);
openEventBridge(function () {
// Set up a handler for receiving the data, and tell the .js we are ready to receive it.
EventBridge.scriptEventReceived.connect(function (message) {