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

Add Header and Contact Us components #45

Merged

Christik merged 22 commits into main from feat/header

Jan 28, 2024

Collaborator

hellagirrl commented Jan 12, 2024

No description provided.


          feat: add header [without button yet]

8e21f13

hellagirrl requested a review from Christik

January 12, 2024 18:28


          feat: add line separating the header and the main parts, remove empty…

ce5f61c

… block in _header.scss

hellagirrl changed the title ~~Add header~~ Add Header and Contact Us components

hellagirrl added 5 commits

January 15, 2024 00:00


          Merge branch 'main' into feat/header

198be2f


          feat: add button to header, start footer

e2e4f41


          feat: add footer [without img files yet]

993c2e2


          fix: update tabulation in footer.njk

9af306d


          feat: add burger menu, hide footer picture on mobile

a3c82ac

hellagirrl marked this pull request as ready for review

January 16, 2024 09:19

hellagirrl added 2 commits

January 16, 2024 13:11


          feat: add js to burger menu

27a5a53


          fix: delete redundant code

fe41260

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/header.njk Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/header.njk Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/header.njk Outdated Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/templates/general/header.njk Outdated Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

serikovlearning reviewed

View reviewed changes

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

Christik requested changes

View reviewed changes

Collaborator

Christik left a comment

Большую работу проделала, молодец! ❤️

frontend/src/scss/_vars.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_layout.scss Outdated Show resolved Hide resolved

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

frontend/src/templates/general/header.njk Show resolved Hide resolved

hellagirrl added 7 commits

January 18, 2024 14:42


          refactor: update toggle_mobile_menu function

b6b2fb2


          Merge branch 'main' into feat/header

ad77ec1


          refactor: create footer_databag, turn email and phone numbers to links

a11f9d0


          styles: remove 100% height from footer, make height depend on footer'…

3b37426

…s content


          styles: create scss variables for burger, reuse mixins for headings a…

78d05d1

…nd media


          styles: update mixins, use scss nesting, add footer picture

3261a21


          fix: bring husky dir back

6b72ab9

Christik requested changes

View reviewed changes

Collaborator

Christik left a comment

Катя, получается вообще красота! 😃

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/scss/layout/_header.scss Outdated Show resolved Hide resolved

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

frontend/src/templates/general/footer.njk Outdated Show resolved Hide resolved

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

frontend/src/scss/_mixins.scss Outdated Show resolved Hide resolved

Christik reviewed

View reviewed changes

frontend/src/scss/_vars.scss Outdated Show resolved Hide resolved

hellagirrl added 2 commits

January 25, 2024 13:36


          fix: PR review fixes

9bf06b0


          fix: make footer contacts section bem alike

85ed0b3

Christik requested changes

View reviewed changes

Collaborator

Christik left a comment

Вообще отлично! 👍

Только перепроверь, пожалуйста, мобильное меню. В адаптиве отступы нужно подправить и размер текста.

Screenshot 2024-01-27 at 07 56 54

Мы уже на финишной прямой! Последние правки и будем мержить)

frontend/src/scss/layout/_footer.scss Outdated Show resolved Hide resolved

hellagirrl and others added 4 commits

January 27, 2024 13:36


          fix: move contact-row to the outer scope, display shelter picture on …

956930a

…mobile [wip]


          fix: make burger menu adaptive

33c00be


          fix: make footer picture adaptive for mobiles and small mobiles

90f881b

fix

ede5095

Christik merged commit 4351631 into main

1 check passed

Christik deleted the feat/header branch

January 28, 2024 04:35

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet