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

Frontend ui refactor
6 years ago · 1d5cf6633f
parent e7613ddd6d 9bee08788b
commit 1d5cf6633f
6 changed files with 7 additions and 8 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -48,7 +48,7 @@ services:
    command: gosu www-data php artisan horizon
    
  db:
-    image: mysql:5.7
+    image: mysql:8.0
    networks:
      - internal
    environment:
--- a/public/js/status.js
+++ b/public/js/status.js
--- a/public/js/timeline.js
+++ b/public/js/timeline.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@ -10,6 +10,6 @@
    "/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
    "/js/profile.js": "/js/profile.js?id=0bb23e4365ea2cd8516c",
    "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
-    "/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf",
-    "/js/timeline.js": "/js/timeline.js?id=ddd67f04a35444e402f7"
+    "/js/status.js": "/js/status.js?id=bf48fe9060a74d1180f2",
+    "/js/timeline.js": "/js/timeline.js?id=58580b00340d53422546"
 }
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@ -363,8 +363,7 @@

 <style type="text/css" scoped>
  .status-comments,
-  .reactions,
-  .col-md-4 {
+  .reactions {
    background: #fff;
  }
  .postPresenterContainer {
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@ -450,7 +450,7 @@
 				axios.get(apiUrl, {
 					params: {
 						max_id: this.max_id,
-						limit: 4
+						limit: 6
 					}
 				}).then(res => {
 					let data = res.data;