Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating the vertical position of the zoom-in text box to have its arrow point to the center of the zoom-in button #3453

Merged
merged 9 commits into from
Jan 23, 2024
Merged

Updating the vertical position of the zoom-in text box to have its arrow point to the center of the zoom-in button #3453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2447f80
centered the arrow on the message box wrt the zoom-in button in the t…
srihariKrishnaswamy Jan 4, 2024
a761dee
added translateY(-50%) as an argument into OnboardingStates
srihariKrishnaswamy Jan 4, 2024
395ca12
changed the rest of the pop up boxes with arrows, including the one w…
srihariKrishnaswamy Jan 5, 2024
f2d5908
changed CSS fadeInRight, fadeInLeft and FadeInDown animations in the …
srihariKrishnaswamy Jan 5, 2024
ebc9dc8
fixed small UI changes (centering boxes, making distances consistent)
srihariKrishnaswamy Jan 12, 2024
0b5e45c
reneged chinese language label buffer change
srihariKrishnaswamy Jan 12, 2024
b9dac62
Merge branch 'develop' of https://github.com/ProjectSidewalk/Sidewalk…
misaugstad Jan 23, 2024
e0161dc
fixes final page of tutorial in German language
misaugstad Jan 23, 2024
26a1c50
removes unused CSS
misaugstad Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/javascripts/SVLabel/css/svl-onboarding.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
left: 0;
z-index: 3;
font-size: 14pt;
transform: None;

border-radius: 3px 3px 3px 3px;
-webkit-border-radius: 3px 3px 3px 3px;
Expand Down
7 changes: 6 additions & 1 deletion public/javascripts/SVLabel/src/SVLabel/onboarding/Onboarding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
*/
function showMessage(parameters) {
var message = parameters.message;

// Make the message flash yellow once to catch your attention.
uiOnboarding.messageHolder.toggleClass("yellow-background");
setTimeout(function () {
Expand Down Expand Up @@ -412,6 +411,12 @@ function Onboarding(svl, audioEffect, compass, form, handAnimation, mapService,
if ("fade-direction" in parameters) {
uiOnboarding.messageHolder.addClass("animated " + parameters["fade-direction"]);
}

if ("transform" in parameters) {
uiOnboarding.messageHolder.css("transform", parameters.transform);
} else {
uiOnboarding.messageHolder.css("transform", "None");
}
}

uiOnboarding.messageHolder.html((typeof message === "function" ? message() : message));
Expand Down
53 changes: 31 additions & 22 deletions public/javascripts/SVLabel/src/SVLabel/onboarding/OnboardingStates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
return dom ? dom.innerHTML : "";
},
"width": 1000,
"top": -50,
"top": -105,
"left": -70,
"padding": "100px 10px 100px 10px",
"background": true
Expand Down Expand Up @@ -225,7 +225,7 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
"maxHeading": headingRanges["stage-1"][1]
},
"message": {
"message": i18next.t('tutorial.select-label-type-2'),
"message": i18next.t('tutorial.select-label-type-2')
},
"panoId": panoId,
"annotations": [
Expand Down Expand Up @@ -397,9 +397,11 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
},
"message": {
"message": i18next.t('tutorial.zoom-in'),
"fade-direction": "fadeInRight",
"arrow": "left",
"top": -44
"fade-direction": "fadeIn",
"top": 30,
"left": 5,
"transform": "translateY(-50%)"
},
"panoId": panoId,
"annotations": null,
Expand Down Expand Up @@ -975,9 +977,11 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
},
"message": {
"message": i18next.t('tutorial.zoom-out'),
"fade-direction": "fadeInRight",
"fade-direction": "fadeIn",
"arrow": "left",
"top": 30
"top": 80,
"left": 5,
"transform": "translateY(-50%)"
},
"panoId": panoId,
"annotations": null,
Expand Down Expand Up @@ -1794,10 +1798,11 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
},
"message": {
"message": i18next.t('tutorial.walk-1'),
"fade-direction": "fadeInLeft",
"fade-direction": "fadeIn",
"arrow": "right",
"top": 310,
"left": 405
"top": 377,
"left": 403,
"transform": "translateY(-50%)"
},
"panoId": panoId,
"transition": function () {
Expand All @@ -1823,10 +1828,11 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
},
"message": {
"message": i18next.t('tutorial.walk-2'),
"fade-direction": "fadeInDown",
"fade-direction": "fadeIn",
"arrow": "bottom",
"top": 225,
"left": 405
"top": 391,
"left": 590,
"transform": "translate(-50%, -100%)"
},
"panoId": panoId,
"annotations": null,
Expand Down Expand Up @@ -1867,9 +1873,10 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
"message": i18next.t('tutorial.walk-4'),
"width": 350,
"arrow": "right",
"fade-direction": "fadeInLeft",
"top": 254,
"left": 350
"fade-direction": "fadeIn",
"top": 377,
"left": 353,
"transform": "translateY(-50%)"
},
"panoId": afterWalkPanoId,
"annotations": null,
Expand Down Expand Up @@ -1987,9 +1994,10 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
"message": {
"message": i18next.t('tutorial.instruction-1'),
"arrow": "right",
"fade-direction": "fadeInLeft",
"top": 270,
"left": 405
"fade-direction": "fadeIn",
"top": 377,
"left": 403,
"transform": "translateY(-50%)"
},
"panoId": afterWalkPanoId,
"annotations": null,
Expand All @@ -2006,10 +2014,11 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
},
"message": {
"message": i18next.t('tutorial.instruction-2'),
"fade-direction": "fadeInRight",
"fade-direction": "fadeIn",
"arrow": "left",
"top": 265,
"left": 5
"top": 340,
"left": 5,
"transform": "translateY(-50%)"
},
"panoId": afterWalkPanoId,
"annotations": null,
Expand All @@ -2031,7 +2040,7 @@ function OnboardingStates (contextMenu, compass, mapService, statusModel, tracke
return document.getElementById("onboarding-outro").innerHTML;
},
"width": 1000,
"top": -50,
"top": -105,
"left": -70,
"padding": "100px 10px 100px 10px",
"background": true
Expand Down