mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-04-30 00:13:08 -06:00 committed by GitHub
parent e7613ddd6d 9bee08788b
commit 1d5cf6633f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -48,7 +48,7 @@ services:
command: gosu www-data php artisan horizon command: gosu www-data php artisan horizon
db: db:
image: mysql:5.7 image: mysql:8.0
networks: networks:
- internal - internal
environment: environment:

2
public/js/status.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -10,6 +10,6 @@
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186", "/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=0bb23e4365ea2cd8516c", "/js/profile.js": "/js/profile.js?id=0bb23e4365ea2cd8516c",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204", "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf", "/js/status.js": "/js/status.js?id=bf48fe9060a74d1180f2",
"/js/timeline.js": "/js/timeline.js?id=ddd67f04a35444e402f7" "/js/timeline.js": "/js/timeline.js?id=58580b00340d53422546"
} }

3
resources/assets/js/components/PostComponent.vue
View File

@ -363,8 +363,7 @@
<style type="text/css" scoped> <style type="text/css" scoped>
.status-comments, .status-comments,
.reactions, .reactions {
.col-md-4 {
background: #fff; background: #fff;
} }
.postPresenterContainer { .postPresenterContainer {

2
resources/assets/js/components/Timeline.vue
View File

@ -450,7 +450,7 @@
axios.get(apiUrl, { axios.get(apiUrl, {
params: { params: {
max_id: this.max_id, max_id: this.max_id,
limit: 4 limit: 6
} }
}).then(res => { }).then(res => {
let data = res.data; let data = res.data;