fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #972 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-05 22:03:00 -07:00 committed by GitHub
parent fe916a09e7 94130fe14c
commit 489a8909f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/components.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -3,7 +3,7 @@
"/js/app.js": "/js/app.js?id=a51da95c2b9df7cf8de2", "/js/app.js": "/js/app.js?id=a51da95c2b9df7cf8de2",
"/css/app.css": "/css/app.css?id=da1490bc71c86824a5d8", "/css/app.css": "/css/app.css?id=da1490bc71c86824a5d8",
"/css/appdark.css": "/css/appdark.css?id=75eb957c4cbdd84b6016", "/css/appdark.css": "/css/appdark.css?id=75eb957c4cbdd84b6016",
"/js/components.js": "/js/components.js?id=77772ec54ac933bf3594", "/js/components.js": "/js/components.js?id=99bc9b36168562483246",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186", "/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/micro.js": "/js/micro.js?id=178479fb6990f8806257", "/js/micro.js": "/js/micro.js?id=178479fb6990f8806257",
"/js/profile.js": "/js/profile.js?id=dce4efc17bd33c44997c", "/js/profile.js": "/js/profile.js?id=dce4efc17bd33c44997c",

18
resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
View file

@ -6,9 +6,9 @@
<p class="font-weight-light">(click to show)</p> <p class="font-weight-light">(click to show)</p>
</summary> </summary>
<b-carousel :id="status.id + '-carousel'" <b-carousel :id="status.id + '-carousel'"
v-model="cursor"
style="text-shadow: 1px 1px 2px #333;" style="text-shadow: 1px 1px 2px #333;"
controls controls
indicators
background="#ffffff" background="#ffffff"
:interval="0" :interval="0"
> >
@ -17,14 +17,17 @@
<img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description"> <img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description">
</div> </div>
</b-carousel-slide> </b-carousel-slide>
<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
{{cursor + 1}} / {{status.media_attachments.length}}
</span>
</b-carousel> </b-carousel>
</details> </details>
</div> </div>
<div v-else> <div v-else>
<b-carousel :id="status.id + '-carousel'" <b-carousel :id="status.id + '-carousel'"
v-model="cursor"
style="text-shadow: 1px 1px 2px #333;" style="text-shadow: 1px 1px 2px #333;"
controls controls
indicators
background="#ffffff" background="#ffffff"
:interval="0" :interval="0"
> >
@ -33,12 +36,21 @@
<img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description"> <img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description">
</div> </div>
</b-carousel-slide> </b-carousel-slide>
<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
{{cursor + 1}} / {{status.media_attachments.length}}
</span>
</b-carousel> </b-carousel>
</div> </div>
</template> </template>
<script type="text/javascript"> <script type="text/javascript">
export default { export default {
props: ['status'] props: ['status'],
data() {
return {
cursor: 0
}
}
} }
</script> </script>