diff --git a/public/js/timeline.js b/public/js/timeline.js index 555e3f964..01c0320f6 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 5f497d2d2..b7b4f1bd0 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 0270d4959..5756de680 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -389,7 +389,8 @@ followingCursor: 1, followingMore: true, lightboxMedia: false, - showSuggestions: false + showSuggestions: false, + showReadMore: true, } }, @@ -415,13 +416,21 @@ this.showSuggestions = true; } + if(localStorage.getItem('pf_metro_ui.exp.rm') == 'false') { + this.showReadMore = false; + } else { + this.showReadMore = true; + } + this.$nextTick(function () { $('[data-toggle="tooltip"]').tooltip() }); }, updated() { - pixelfed.readmore(); + if(this.showReadMore == true) { + pixelfed.readmore(); + } }, methods: { diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index ad9b82063..e160f2109 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -5,7 +5,7 @@
-
{{ __('Reset Password') }}
+
{{ __('Reset Password') }}
@@ -14,11 +14,8 @@
- - -
- - +
+ @if ($errors->has('email')) {{ $errors->first('email') }} @@ -26,12 +23,10 @@ @endif
- +
- - -
- +
+ @if ($errors->has('password')) @@ -42,10 +37,8 @@
- - -
- +
+ @if ($errors->has('password_confirmation')) @@ -56,8 +49,8 @@
-
-
diff --git a/resources/views/settings/labs.blade.php b/resources/views/settings/labs.blade.php index 2b8d47215..2dba9590e 100644 --- a/resources/views/settings/labs.blade.php +++ b/resources/views/settings/labs.blade.php @@ -162,9 +162,16 @@ -

Show Profile Suggestions

+

Show Profile Suggestions.

@endif +
+ + +

Collapses captions/comments more than 3 lines.

+

Discovery


@@ -191,18 +198,31 @@ @endpush \ No newline at end of file