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

Frontend ui refactor
2019-04-30 00:13:08 -06:00 · 2019-04-30 00:13:08 -06:00 · 1d5cf6633f
commit 1d5cf6633f
parent e7613ddd6d 9bee08788b
6 changed files with 3 additions and 4 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
--- 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;