Skip to content

Fix tour arrow overlap with modal text content #5296

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

Merged
walterbender merged 4 commits into from
Jan 28, 2026
Merged

Fix tour arrow overlap with modal text content #5296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
247f475
Fix tour arrow overlap and update abc tests
Jan 24, 2026
71d8a13
Revert abc.test.js changes to focus PR on navigation arrow fix only
Jan 25, 2026
f05502e
Fix abc.test.js to match upstream master
Jan 25, 2026
c59e7fb
Fix Prettier formatting in abc.test.js
Jan 25, 2026
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
17 changes: 10 additions & 7 deletions css/activities.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,12 +1051,12 @@ table {
}

#right-arrow {
left: 385px;
right: 25px;
background: url("../header-icons/right-arrow.png");
}

#left-arrow {
left: 5px;
left: 10px;
background: url("../header-icons/left-arrow.png");
}

Expand Down Expand Up @@ -1177,12 +1177,14 @@ table {

#helpBodyDiv {
position: relative;
left: 45px;
margin: 0 auto !important;
left: 0 !important;
border: 0 !important;
overflow-x: hidden;
overflow-y: auto;
width: 350px;
padding: 1rem 1rem 0 0;
width: calc(100% - 130px) !important;
max-width: 350px;
padding: 1rem 1rem 0 1rem;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down Expand Up @@ -2107,7 +2109,7 @@ table {

#right-arrow {
left: auto !important; /* Unset the old fixed pixel value */
right: 10px !important; /* Stick to the right edge */
right: 25px !important; /* Stick to the right edge */
}

/* --- Desktop View (Screens wider than 900px) --- */
Expand Down Expand Up @@ -2138,7 +2140,8 @@ table {

/* Fix the inner text box width so it doesn't overflow */
#helpBodyDiv {
width: 100% !important;
width: calc(100% - 110px) !important;
margin: 0 auto !important;
left: 0 !important;
padding: 0 10px;
box-sizing: border-box;
Expand Down
26 changes: 13 additions & 13 deletions js/__tests__/abc.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ describe("processABCNotes - Basic Note Processing", () => {

beforeEach(() => {
logo = {
notationNotes: { "0": "" },
notationNotes: { 0: "" },
notation: {
notationStaging: {
"0": [
0: [
[["G♯4"], 4, 0, null, null, -1, false],
[["F4"], 4, 0, null, null, -1, false],
[["G♯4"], 2, 0, null, null, -1, false]
Expand Down Expand Up @@ -88,7 +88,7 @@ describe("processABCNotes - Advanced Note Handling", () => {
let logo;

beforeEach(() => {
logo = { notationNotes: { "0": "" }, notation: { notationStaging: { "0": [] } } };
logo = { notationNotes: { 0: "" }, notation: { notationStaging: { 0: [] } } };
});

it("should handle frequency (number) inputs", () => {
Expand Down Expand Up @@ -125,7 +125,7 @@ describe("processABCNotes - Advanced Note Handling", () => {
describe("processABCNotes - Control Strings", () => {
let logo;
beforeEach(() => {
logo = { notationNotes: { "0": "" }, notation: { notationStaging: { "0": [] } } };
logo = { notationNotes: { 0: "" }, notation: { notationStaging: { 0: [] } } };
});

it("should handle all string commands correctly", () => {
Expand Down Expand Up @@ -182,7 +182,7 @@ describe("processABCNotes - Control Strings", () => {
describe("processABCNotes - Chords", () => {
let logo;
beforeEach(() => {
logo = { notationNotes: { "0": "" }, notation: { notationStaging: { "0": [] } } };
logo = { notationNotes: { 0: "" }, notation: { notationStaging: { 0: [] } } };
});

it("should handle chords correctly (Start, Middle, End)", () => {
Expand Down Expand Up @@ -218,7 +218,7 @@ describe("processABCNotes - Chords", () => {
describe("processABCNotes - Tuplet Handling", () => {
let logo;
beforeEach(() => {
logo = { notationNotes: { "0": "" }, notation: { notationStaging: { "0": [] } } };
logo = { notationNotes: { 0: "" }, notation: { notationStaging: { 0: [] } } };
});

it("should process standard tuplets correctly", () => {
Expand All @@ -229,7 +229,7 @@ describe("processABCNotes - Tuplet Handling", () => {
];

processABCNotes(logo, "0");
expect(logo.notationNotes["0"]).toBe("(1:1G^ 2G^ 2G^ 2 ");
expect(logo.notationNotes["0"]).toBe("(1:1G^ 2G^ 2G^ 2 ");
});

it("should handle array of notes (chords) inside tuplets", () => {
Expand Down Expand Up @@ -270,7 +270,7 @@ describe("processABCNotes - Edge Cases for 100% Coverage", () => {
let logo;

beforeEach(() => {
logo = { notationNotes: { "0": "" }, notation: { notationStaging: { "0": [] } } };
logo = { notationNotes: { 0: "" }, notation: { notationStaging: { 0: [] } } };
});

it("should handle array of notes in NOTATIONNOTE field", () => {
Expand Down Expand Up @@ -321,10 +321,10 @@ describe("saveAbcOutput", () => {
activity = {
logo: {
notationOutput: "",
notationNotes: { "0": "" },
notationNotes: { 0: "" },
notation: {
notationStaging: {
"0": [[["G♯4"], 4, 0, null, null, -1, false]]
0: [[["G♯4"], 4, 0, null, null, -1, false]]
}
}
},
Expand Down Expand Up @@ -353,10 +353,10 @@ describe("saveAbcOutput", () => {
describe("processABCNotes - Tuplet Handling", () => {
it("should process tuplets correctly", () => {
const logo = {
notationNotes: { "0": "" },
notationNotes: { 0: "" },
notation: {
notationStaging: {
"0": [
0: [
[["G♯4"], 4, 0, 3, 2, -1, false],
[["F4"], 4, 0, 3, 2, -1, false],
[["G♯4"], 4, 0, 3, 2, -1, false]
Expand All @@ -366,7 +366,7 @@ describe("processABCNotes - Tuplet Handling", () => {
};

processABCNotes(logo, "0");
expect(logo.notationNotes["0"]).toBe("(1:1G^ 2G^ 2G^ 2 ");
expect(logo.notationNotes["0"]).toBe("(1:1G^ 2G^ 2G^ 2 ");
});
});

Expand Down
Loading