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

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

Merged
merged 12 commits into from
May 31, 2024
Merged

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

merged 12 commits into from
May 31, 2024

Commits on Apr 4, 2024

  1. testing

    @Finn245
    Finn245 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    f2788a9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Finn245/New_Feature_Branch 

    testing
    @Finn245
    Finn245 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    5964eec View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Updated CSS positioning lesson with a helpful video from 'Slay the Dr… 

    …agon,' enriching learning experience with visual demonstrations in the additional resource section.
    @Finn245
    Finn245 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e575a32 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge remote-tracking branch 'origin/main' into update/css-positionin… 

    …g-lesson
    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    3d89379 View commit details
    Browse the repository at this point in the history

  2. Resolved merge conflict with 'origin/main' and updated link text for … 

    …CSS positioning lesson
    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    9411880 View commit details
    Browse the repository at this point in the history

  3. implement requested changes 

    This reverts commit f2788a9.
    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    7c0a67f View commit details
    Browse the repository at this point in the history

  4. updated link text for CSS positioning lesson

    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d9103ac View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into update/css-positioning-lesson

    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ec481ba View commit details
    Browse the repository at this point in the history

  6. updated link text for CSS positioning lesson

    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e77d6c2 View commit details
    Browse the repository at this point in the history

  7. Update intermediate_html_css/intermediate_css_concepts/positioning.md 

    Co-authored-by: MaoShizhong <122839503+MaoShizhong@users.noreply.github.com>
    @Finn245 @MaoShizhong
    Finn245 and MaoShizhong committed May 31, 2024
    Configuration menu
    Copy the full SHA
    1a31d85 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'update/css-positioning-lesson' of github.com:Finn245/cu… 

    …rriculum into update/css-positioning-lesson
    @Finn245
    Finn245 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    517a152 View commit details
    Browse the repository at this point in the history

  9. Update intermediate_html_css/intermediate_css_concepts/positioning.md 

    Co-authored-by: MaoShizhong <122839503+MaoShizhong@users.noreply.github.com>
    @Finn245 @MaoShizhong
    Finn245 and MaoShizhong committed May 31, 2024
    Configuration menu
    Copy the full SHA
    c7d8f47 View commit details
    Browse the repository at this point in the history