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.

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

Update intermediate HTML CSS/ CSS positioning lesson/Additional resources section: Adding a video #27868

Merged
merged 12 commits into from
May 31, 2024

Conversation

Finn245
Copy link
Contributor

@Finn245 Finn245 commented Apr 26, 2024

Because:

This PR enhances the CSS positioning lesson by integrating insights and examples from the 'Slay the Dragon' video tutorial, which recaps the CSS positioning concepts covered in the lesson with such an easy examples.

This PR:

  • Incorporates the video tutorial on CSS positioning from 'Slay the Dragon' to enrich the lesson content.
  • Enhances the lesson with visual demonstrations for improved clarity.

Additional Information:

This update enriches the learning experience by providing supplemental material that reinforces key concepts covered in the CSS positioning lesson.

Finn245 and others added 3 commits April 4, 2024 17:23
…agon,' enriching learning experience with visual demonstrations in the additional resource section.
@github-actions github-actions bot added the Content: Intermediate HTML/CSS Involves the Intermediate HTML/CSS course label Apr 26, 2024
@wise-king-sullyman wise-king-sullyman requested review from a team and ManonLef and removed request for a team April 27, 2024 12:48
@Finn245 Finn245 marked this pull request as draft April 29, 2024 12:00
@Finn245 Finn245 marked this pull request as ready for review April 29, 2024 12:05
@Finn245 Finn245 changed the title Update/css positioning lesson Update intermediate HTML CSS/ CSS positioning lesson/Additional resources section: Adding a video Apr 29, 2024
Copy link
Contributor

@MaoShizhong MaoShizhong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Finn245

Could you resolve the merge conflict please? While doing this, could you also extend the link text for your added video to include"CSS positioning from"? So the link text should read "CSS positioning from Slaying the Dragon". That would make it sufficiently descriptive and accessible.

README.md Outdated Show resolved Hide resolved
@MaoShizhong
Copy link
Contributor

Looks like there's still the merge conflict to resolve.
I see you tried to resolve it by fetching and merging origin/main, your remote fork, except your remote fork is out of sync with upstream main (TOP's repo).

You can either sync your remote fork with upstream on GH, then redo the fetch and merge resolution to origin main, or you can skip the first step by just fetching from upstream main and merging upstream/main instead (i.e. syncing your local fork directly with TOP's repo).

Copy link
Contributor

@MaoShizhong MaoShizhong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there! Just need the below quick change as well as removing the trailing space on line 72, and the extra blank lines at the end of the file.
Our lesson files need to end with only a single blank line, but it looks like there are 3 blank lines instead.

Finn245 and others added 2 commits May 31, 2024 14:54
@Finn245
Copy link
Contributor Author

Finn245 commented May 31, 2024

Oh okay so i have to remove the trailing space in line 72 and remove the last line which is the 75 so we keep only 1 blank line(74 one)?

@MaoShizhong
Copy link
Contributor

Oh okay so i have to remove line 72 and remove the last line which is the 75 so we keep only 1 blank line(74 one)?

Yep. Either remove the space on line 72 (it's not blank, it's a line with just a space in it), or remove that line altogether (we don't need it anyway). Then files must end with only a single blank line, so delete any extra blank lines at the end of the file.

Co-authored-by: MaoShizhong <122839503+MaoShizhong@users.noreply.github.com>
Copy link
Contributor

@MaoShizhong MaoShizhong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks for the new resource, it's a nice video on the topic for sure 👍

@MaoShizhong MaoShizhong merged commit 2932090 into TheOdinProject:main May 31, 2024
3 checks passed
@Finn245
Copy link
Contributor Author

Finn245 commented May 31, 2024

Thank you for your kind words! I'm thrilled that you found the new resource helpful. I'm looking forward to contributing more and continuing to enhance this project . Your encouragement means a lot, and I'm excited to collaborate further 😊👍.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content: Intermediate HTML/CSS Involves the Intermediate HTML/CSS course
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants