search

CorrelAid / correlaid_website

Source code for the CorrelAid website
https://correlaid.org
3 stars 0 forks source link

#249: more typical styling for inline code #298

Closed friep closed 11 months ago

friep commented 11 months ago

adds more "typical" styling for inline code. i hope this is not too controversial and we don't have to do a poll for it?! :D lots of other people also don't like the default. https://github.com/tailwindlabs/tailwindcss-typography/issues/18

i copied and adapted from here: https://futurestud.io/tutorials/tailwind-css-remove-backticks-around-inline-code

before:

Screenshot 2023-05-09 at 12 27 45

after:

Screenshot 2023-05-09 at 12 27 21

closes #249 which i reopened to add this.

KonradUdoHannes commented 11 months ago

@friep currently we try to merge into preview first and only merge preview into main. This is not the most comfortable process as main is selected as the PR target by default. Maybe we should change this again.

KonradUdoHannes commented 11 months ago

Can we reopen another PR. I think your extensive description can be copied from edit mode so it should not be too much trouble.

friep commented 11 months ago

@KonradUdoHannes ahhh yesss... i changed the base branch here (that's actually possible :)) . thanks for the quick feedback!!

KonradUdoHannes commented 11 months ago

@friep cool I didn't know this can just be changed. Also next time its best to make a fork from preview in which case the commit won't contain all our previous merge commits (which don't actually change anything because they all come from preview itself).

Maybe we should go from main / preview to production / main as branches where the new main takes the role of the old preview and the new production of the old main (Changing the cloudflare CD settings accordingly). This would probably make it more intuitive for contributors as it would then involve the more normal branch and merge into main pattern. @jstet what do you think.

friep commented 11 months ago

this is deflecting a bit from the OT of the PR but imho this pattern is ok! i like main being the default branch reflecting the current state of the website. I think documenting this in the README a bit more and giving contributors a heads-up where to merge off from would be sufficient :) was also partially my fault as first time contributor for not reading the README where it says "Merge with preview, then merge with master." - kind of implying a merge off from preview for development purposes. :)