Header and footer layout update

tjikko-studio / components

Component library for Tjikko Studio apps

0 stars 0 forks source link

Header and footer layout update #193

Closed ktryndchrs closed 3 years ago

ktryndchrs commented 3 years ago

Changes

Header nav now sticky
Logos now visible everywhere
Added the floating section at the end before the footer with some extra options
Footer mobile layout not broken anymore
Other small changes

⚠️ Other Branches dependancies

Backend : https://github.com/tjikko-studio/SMPX-Backend/pull/88
Website : https://github.com/tjikko-studio/SMPX-Website/pull/ 67
Latest update on tjikko-studio/SMPX-Content

ktryndchrs commented 3 years ago

Seems like this branch is out-of-sync with the main branch. Do you need help fixing the conflicts @ktryndchrs ?

Strange as I create this branch straight out of the main one @shawninder 🤔

shawninder commented 3 years ago

Strange as I create this branch straight out of the main one @shawninder 🤔

Perhaps you were out-of-sync with main when creating your new branch? Or perhaps the main branch has changed since you branched out? In any case it should be a simple case of :

git pull
git checkout YOUR_BRANCH
git merge main

and fixing conflicts, though this last part can sometimes be a bit tricky

ktryndchrs commented 3 years ago

Strange as I create this branch straight out of the main one @shawninder 🤔

Perhaps you were out-of-sync with main when creating your new branch? Or perhaps the main branch has changed since you branched out? In any case it should be a simple case of :
git pull
git checkout YOUR_BRANCH
git merge main
and fixing conflicts, though this last part can sometimes be a bit tricky

done