Skip to content

Commit

Permalink
Merge branch 'enlarge-image-click' of https://github.com/we-dance/pla…
Browse files Browse the repository at this point in the history
…tform into enlarge-image-click
  • Loading branch information
iiio2 committed Jun 5, 2023
2 parents 9937101 + 6b8dbc2 commit 4060497
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 3 deletions.
9 changes: 8 additions & 1 deletion assets/css/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ html {
min-width: 10rem;
}

/* purgecss end ignore */
.typo {
/* These are technically the same, but use both */
overflow-wrap: break-word;
Expand All @@ -128,4 +127,12 @@ html {
-moz-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;
=======
.enlargeable-image > .slot > img.default {
border-radius: 50%;
>>>>>>> a7a58bd (Issue[#323]: click image to enlarge)
=======
.enlargeable-image > .slot > img.default {
border-radius: 50%;
>>>>>>> a7a58bdf4bac59d2559505fbafcc4937711ab0fa
}
5 changes: 3 additions & 2 deletions components/TProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@
</TDropdown>
</THeader>

<<<<<<< HEAD
<div class="grid grid-cols-4 gap-4 p-4">
<div>
<EnlargeableImage
<img
v-if="profile.photo"
:src="profile.photo"
:src_large="profile.photo"
:alt="profile.username"
class="w-full rounded-full"
/>
<TIcon
v-else-if="profile.type !== 'City'"
Expand Down
1 change: 1 addition & 0 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export default {
'~/plugins/directives',
'~/plugins/vue-tailwind',
'~/plugins/vue-datepicker',
{ src: '@/plugins/enlarge', mode: 'client', ssr: false },
],
/*
** Nuxt.js dev-modules
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"*.{css,vue}": "stylelint"
},
"dependencies": {
"@diracleo/vue-enlargeable-image": "^0.0.7",
"@nuxt/content": "^1.9.0",
"@nuxt/markdown": "^0.0.21",
"@nuxt/vue-app": "^2.15.8",
Expand Down
5 changes: 5 additions & 0 deletions plugins/enlarge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Vue from 'vue'
import EnlargeableImage from '@diracleo/vue-enlargeable-image'
Vue.config.productionTip = false

Vue.component('EnlargeableImage', EnlargeableImage)
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,11 @@
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==

"@diracleo/vue-enlargeable-image@^0.0.7":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@diracleo/vue-enlargeable-image/-/vue-enlargeable-image-0.0.7.tgz#d1b9d9519effebb868c3840188a4d867e1507977"
integrity sha512-nwrDbNQPDptwj4QRUdhvCwOfHW3ZLitaCZfjx7i+OsF1LiVcbHCgikbzrkORqCXSY3caCu+gPftElNXk37cwoQ==

"@firebase/[email protected]":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.4.0.tgz#d6716f9fa36a6e340bc0ecfe68af325aa6f60508"
Expand Down

0 comments on commit 4060497

Please sign in to comment.