Skip to content

Commit ad920ec

Browse files
authored
Merge pull request #180 from yfosp/finalize-git-and-github-section
Finalize Git & GitHub section
2 parents 8083cb8 + f420547 commit ad920ec

File tree

3 files changed

+9
-33
lines changed

3 files changed

+9
-33
lines changed

community-website/pages/learn-git-and-github.tsx

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ const LearnGitAndGitHub: NextPage = () => {
109109
</p>
110110

111111
<div className={specificStyles.slideCounter}>
112+
<span style={{fontWeight: "bold"}}>Slide </span>
112113
<span id="slide-number" style={{fontWeight: "bold"}}>1</span>
113114
<span style={{fontWeight: "bold"}}> / </span>
114115
<span id="total-slides" style={{fontWeight: "bold"}}>15</span>
@@ -364,38 +365,12 @@ const LearnGitAndGitHub: NextPage = () => {
364365

365366
{/* Slide 13 */}
366367
<div className={specificStyles.slide}>
367-
<h2>Git Branching Visualization</h2>
368-
<h3>Branch Structure Example:</h3>
369-
<div className={specificStyles.diagramContainer}>
370-
<div className={specificStyles.branchDiagram}>
371-
<div className={specificStyles.branchLine}>
372-
<div className={specificStyles.branchName}>main</div>
373-
<div className={specificStyles.commitNode}>A</div>
374-
<div className={specificStyles.commitNode}>B</div>
375-
<div className={specificStyles.commitNode}>E</div>
376-
<div className={specificStyles.commitNode}>F</div>
377-
</div>
378-
<div className={specificStyles.branchLine} style={{ marginLeft: 80 }}>
379-
<div className={specificStyles.branchName}>feature</div>
380-
<div style={{ width: 40 }}></div>
381-
<div className={specificStyles.commitNode}>C</div>
382-
<div className={specificStyles.commitNode}>D</div>
383-
</div>
384-
<div style={{ position: "relative", height: 20, width: "100%", margin: "-25px 0" }}>
385-
<div style={{ position: "absolute", left: 160, top: -10, width: 80, height: 2, background: "#667eea" }}></div>
386-
<div style={{ position: "absolute", left: 240, top: -10, width: 2, height: 30, background: "#667eea" }}></div>
387-
<div style={{ position: "absolute", left: 240, top: 18, width: 80, height: 2, background: "#667eea" }}></div>
388-
</div>
389-
</div>
390-
</div>
391-
<h3>GitHub Flow Process:</h3>
392-
<div className={specificStyles.githubFlowDiagram}>
393-
<div className={specificStyles.flowStep}><div className={specificStyles.stepNumber}>1</div>Create feature branch from main</div>
394-
<div className={specificStyles.flowStep}><div className={specificStyles.stepNumber}>2</div>Make changes and commit</div>
395-
<div className={specificStyles.flowStep}><div className={specificStyles.stepNumber}>3</div>Open Pull Request</div>
396-
<div className={specificStyles.flowStep}><div className={specificStyles.stepNumber}>4</div>Code review and discussion</div>
397-
<div className={specificStyles.flowStep}><div className={specificStyles.stepNumber}>5</div>Merge to main and deploy</div>
398-
</div>
368+
<h2>Git vs GitHub</h2>
369+
<img
370+
src="/gitVsgithub.png"
371+
alt="Git vs GitHub"
372+
style={{ maxWidth: "100%", height: "auto", borderRadius: 8, boxShadow: "0 2px 8px rgba(0,0,0,0.08)", margin: "24px 0" }}
373+
/>
399374
{renderButtonsComponent()}
400375
</div>
401376

272 KB
Loading

community-website/styles/LearnGitAndGitHub.module.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
backdrop-filter: blur(10px);
2525
border: 1px solid rgba(255, 255, 255, 0.2);
2626
overflow-x: hidden;
27+
text-align: center;
2728
}
2829

2930
.slide.active {
@@ -107,6 +108,7 @@
107108
z-index: 1000;
108109
flex-wrap: wrap;
109110
backdrop-filter: blur(10px);
111+
margin-top: 30px;
110112
}
111113

112114
.navBtn {
@@ -205,7 +207,6 @@
205207
border-radius: 6px;
206208
}
207209

208-
209210
/* Media queries for small devices */
210211
@media (max-width: 768px) {
211212
.slide {

0 commit comments

Comments
 (0)