Add Comments Styling

[shekharkhedekar]

[mrengy]

I caught one other thing about distorted profile photos and updated my review comment with that.

Also, I pulled this branch to dev in case you'd like to look at it there.

[shekharkhedekar]

@mrengy fixed the reply stuff (class name changed) and the avatar size (weird flex box issue)

[mrengy]

Thanks! The fixes look good.

I was getting some merge conflicts locally, and I did a reset --hard which resolved them. I got the same merge conflicts when pulling this branch to dev. I think this is due to the rebase you did, right? Do you think we will be missing any changes if I do the same reset --hard on dev? If it seems safe to do this, I'll let you merge this PR and later I'll update it on dev (I'll be traveling most of the day tomorrow).

Here's some Terminal output from dev.

[disston]$ git pull remote: Enumerating objects: 127, done. remote: Counting objects: 100% (58/58), done. remote: Compressing objects: 100% (21/21), done. remote: Total 127 (delta 37), reused 49 (delta 33), pack-reused 69 Receiving objects: 100% (127/127), 47.51 KiB | 170.00 KiB/s, done. Resolving deltas: 100% (56/56), completed with 10 local objects. From https://github.com/mrengy/vanguard-history

• 82d844d...196a6fc shekhar/comments -> origin/shekhar/comments (forced update) 13ac5c2..9591bbf main -> origin/main
• 914162d...2103f1f shekhar/footer -> origin/shekhar/footer (forced update)
• f726891...7d9a332 shekhar/test-build-sass -> origin/shekhar/test-build-sass (forced update) Auto-merging wp-content/themes/vanguard-history/style.scss CONFLICT (content): Merge conflict in wp-content/themes/vanguard-history/style.scss Auto-merging wp-content/themes/vanguard-history/style.css CONFLICT (content): Merge conflict in wp-content/themes/vanguard-history/style.css Removing wp-content/themes/vanguard-history/img/RedShield.svg Auto-merging wp-content/themes/vanguard-history/functions.php Auto-merging wp-content/themes/vanguard-history/css/_year.scss Auto-merging wp-content/themes/vanguard-history/css/_comments.scss CONFLICT (add/add): Merge conflict in wp-content/themes/vanguard-history/css/_comments.scss Automatic merge failed; fix conflicts and then commit the result. [disston]$

[shekharkhedekar]

Once I merge to main you should be able to pull on dev/stage. I don't know why you had to reset --hard. I prefer rebasing on main to merging main in to preserve commit history and avoid ugly merge commits. I think you need to approve the PR before I can merge

[github-actions[bot]]

2 file(s) had their final line ending fixed:

• wp-content/themes/vanguard-history/comments.php ,- wp-content/themes/vanguard-history/style.css