diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css index 3c82a16a..3dc9bcb8 100644 --- a/assets/css/tailwind.css +++ b/assets/css/tailwind.css @@ -111,6 +111,7 @@ html { min-width: 10rem; } +<<<<<<< HEAD .typo { /* These are technically the same, but use both */ overflow-wrap: break-word; @@ -127,6 +128,10 @@ html { -moz-hyphens: auto; -webkit-hyphens: auto; hyphens: auto; +======= +.enlargeable-image > .slot > img.default { + border-radius: 50%; +>>>>>>> a7a58bd (Issue[#323]: click image to enlarge) } /* purgecss end ignore */ diff --git a/components/TProfile.vue b/components/TProfile.vue index 13393f25..39430a6a 100644 --- a/components/TProfile.vue +++ b/components/TProfile.vue @@ -57,13 +57,19 @@ +<<<<<<< HEAD