Skip to content

Relocate tutorial nav UI #10840

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

Open
ssande-fwd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Relocate tutorial nav UI #10840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f372a
move tutorial nav controls to top of tutorial container
ssande-fwd Aug 8, 2025
3f4f0f3
Merge branch 'microsoft:master' into master
ssande-fwd Aug 18, 2025
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
15 changes: 6 additions & 9 deletions theme/tutorial-sidebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@
}

.tutorial-controls {
border-top: 2px solid var(--pxt-neutral-alpha50);
margin-top: 1rem;
margin-bottom: 1rem;
}

/*******************************
Expand Down Expand Up @@ -251,7 +250,7 @@
.tutorial-controls {
display: flex;
flex-direction: row;
justify-content: space-between;
justify-content: end;
flex-wrap: wrap;
margin-bottom: 1rem;

Expand Down Expand Up @@ -592,7 +591,6 @@
.immersive-reader-button.ui.item {
float: right;
border: 2px solid var(--pxt-neutral-stencil1);
margin-left: 1.5rem;
}
}

Expand Down Expand Up @@ -700,7 +698,6 @@
min-height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
padding: .5rem 1rem 0.7rem 1rem;

.tutorial-step-content {
Expand All @@ -709,8 +706,8 @@

.immersive-reader-button {
position: absolute;
top: 0.3rem;
right: 1rem;
top: 1rem;
left: 1rem;
}
}

Expand Down Expand Up @@ -782,7 +779,6 @@
padding: 0 0;
column-gap: 1rem;
border-bottom: unset;
margin-left: auto;

.ui.button {
margin: 0;
Expand Down Expand Up @@ -815,10 +811,11 @@

.tutorial-controls {
display: flex;
gap: 1rem;
align-items: center;
margin: 0;
margin-top: 0.5rem;
padding: 0.7rem 0 0 0;
padding: 0 0 0.7rem 0;

> .ui.button {
width: unset;
Expand Down
10 changes: 5 additions & 5 deletions webapp/src/components/tutorial/TutorialContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,18 @@ export function TutorialContainer(props: TutorialContainerProps) {
{!isHorizontal && stepCounter}
<div className={classList("tutorial-content", hasHint && "has-hint")} ref={contentRef} onScroll={updateScrollGradient}>
<div className={"tutorial-content-bkg"}>
<div className="tutorial-controls steve4">
{hasHint && <TutorialHint tutorialId={tutorialId} currentStep={visibleStep} markdown={hintMarkdown} parent={parent} />}
{isHorizontal && stepCounter}
{!isHorizontal && nextButton}
</div>
{!isHorizontal && <div className="tutorial-step-label">
{name && <span className="tutorial-step-title">{name}</span>}
<span className="tutorial-step-number">{lf("Step {0} of {1}", visibleStep + 1, steps.length)}</span>
</div>}
{showImmersiveReader && <ImmersiveReaderButton ref={immReaderRef} content={markdown} tutorialOptions={tutorialOptions} />}
{title && <div className="tutorial-title">{title}</div>}
<MarkedContent className="no-select tutorial-step-content" tabIndex={0} markdown={markdown} parent={parent} contentRef={handleMarkedContentRef}/>
<div className="tutorial-controls">
{hasHint && <TutorialHint tutorialId={tutorialId} currentStep={visibleStep} markdown={hintMarkdown} parent={parent} />}
{isHorizontal && stepCounter}
{!isHorizontal && nextButton}
</div>
</div>
</div>
{validationFailures.length > 0 &&
Expand Down